Commit a11d25b1 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Responsive improvements

Signed-off-by: default avatarDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
parent b936addf
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
.dashboard.row .dashboard.row
.activities.col-md-8 .activities.col-md-8
= render 'activities' = render 'activities'
.side.col-md-4.hidden-xs.hidden-sm .side.col-md-4
= render 'sidebar' = render 'sidebar'
- else - else
......
...@@ -8,35 +8,34 @@ ...@@ -8,35 +8,34 @@
%span.separator %span.separator
%h1.project_name= title %h1.project_name= title
.hidden-xs.hidden-sm %ul.nav.navbar-nav
%ul.nav.navbar-nav %li
%a
%div.gl-hide.turbolink-spinner
%i.icon-refresh.icon-spin
Loading...
%li.hidden-sm
= render "layouts/search"
%li
= link_to public_root_path, title: "Public area", class: 'has_bottom_tooltip', 'data-original-title' => 'Public area' do
%i.icon-globe
%li
= link_to user_snippets_path(current_user), title: "My snippets", class: 'has_bottom_tooltip', 'data-original-title' => 'Public area' do
%i.icon-paste
- if current_user.is_admin?
%li %li
%a = link_to admin_root_path, title: "Admin area", class: 'has_bottom_tooltip', 'data-original-title' => 'Admin area' do
%div.gl-hide.turbolink-spinner %i.icon-cogs
%i.icon-refresh.icon-spin - if current_user.can_create_project?
Loading...
%li %li
= render "layouts/search" = link_to new_project_path, title: "New project", class: 'has_bottom_tooltip', 'data-original-title' => 'New project' do
%li %i.icon-plus
= link_to public_root_path, title: "Public area", class: 'has_bottom_tooltip', 'data-original-title' => 'Public area' do %li
%i.icon-globe = link_to profile_path, title: "Profile settings", class: 'has_bottom_tooltip', 'data-original-title' => 'Profile settings"' do
%li %i.icon-user
= link_to user_snippets_path(current_user), title: "My snippets", class: 'has_bottom_tooltip', 'data-original-title' => 'Public area' do %li
%i.icon-paste = link_to destroy_user_session_path, class: "logout", method: :delete, title: "Logout", class: 'has_bottom_tooltip', 'data-original-title' => 'Logout' do
- if current_user.is_admin? %i.icon-signout
%li %li
= link_to admin_root_path, title: "Admin area", class: 'has_bottom_tooltip', 'data-original-title' => 'Admin area' do = link_to current_user, class: "profile-pic", id: 'profile-pic' do
%i.icon-cogs = image_tag avatar_icon(current_user.email, 26), alt: 'User activity'
- if current_user.can_create_project?
%li
= link_to new_project_path, title: "New project", class: 'has_bottom_tooltip', 'data-original-title' => 'New project' do
%i.icon-plus
%li
= link_to profile_path, title: "Profile settings", class: 'has_bottom_tooltip', 'data-original-title' => 'Profile settings"' do
%i.icon-user
%li
= link_to destroy_user_session_path, class: "logout", method: :delete, title: "Logout", class: 'has_bottom_tooltip', 'data-original-title' => 'Logout' do
%i.icon-signout
%li
= link_to current_user, class: "profile-pic", id: 'profile-pic' do
= image_tag avatar_icon(current_user.email, 26), alt: 'User activity'
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
%li.pull-right %li.pull-right
.pull-right .pull-right
= form_tag project_issues_path(@project), method: :get, id: "issue_search_form", class: 'inline issue-search-form' do = form_tag project_issues_path(@project), method: :get, id: "issue_search_form", class: 'inline issue-search-form' do
.append-right-10 .append-right-10.hidden-xs.hidden-sm
= search_field_tag :issue_search, nil, { placeholder: 'Filter by title or description', class: 'form-control issue_search search-text-input' } = search_field_tag :issue_search, nil, { placeholder: 'Filter by title or description', class: 'form-control issue_search search-text-input' }
- if can? current_user, :write_issue, @project - if can? current_user, :write_issue, @project
= link_to new_project_issue_path(@project, issue: { assignee_id: params[:assignee_id], milestone_id: params[:milestone_id]}), class: "btn btn-new", title: "New Issue", id: "new_issue_link" do = link_to new_project_issue_path(@project, issue: { assignee_id: params[:assignee_id], milestone_id: params[:milestone_id]}), class: "btn btn-new", title: "New Issue", id: "new_issue_link" do
......
.side-filters .side-filters.hidden-xs.hidden-sm
= form_tag filter_path(entity), method: 'get' do = form_tag filter_path(entity), method: 'get' do
%fieldset.scope-filter %fieldset.scope-filter
%ul.nav.nav-pills.nav-stacked %ul.nav.nav-pills.nav-stacked
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
= link_to filter_path(entity, status: 'all') do = link_to filter_path(entity, status: 'all') do
All All
%fieldset.hidden-xs.hidden-sm %fieldset
%legend Projects %legend Projects
%ul.nav.nav-pills.nav-pills-small.nav-stacked %ul.nav.nav-pills.nav-pills-small.nav-stacked
- @projects.each do |project| - @projects.each do |project|
......
= form_tag project_entities_path, method: 'get' do .side-filters.hidden-xs.hidden-sm
%fieldset = form_tag project_entities_path, method: 'get' do
- if current_user %fieldset
%ul.nav.nav-pills.nav-stacked - if current_user
%li{class: ("active" if params[:scope].blank?)} %ul.nav.nav-pills.nav-stacked
= link_to project_filter_path(scope: nil) do %li{class: ("active" if params[:scope].blank?)}
Everyone's = link_to project_filter_path(scope: nil) do
%li{class: ("active" if params[:scope] == 'assigned-to-me')} Everyone's
= link_to project_filter_path(scope: 'assigned-to-me') do %li{class: ("active" if params[:scope] == 'assigned-to-me')}
Assigned to me = link_to project_filter_path(scope: 'assigned-to-me') do
%li{class: ("active" if params[:scope] == 'created-by-me')} Assigned to me
= link_to project_filter_path(scope: 'created-by-me') do %li{class: ("active" if params[:scope] == 'created-by-me')}
Created by me = link_to project_filter_path(scope: 'created-by-me') do
Created by me
%ul.nav.nav-pills.nav-stacked %ul.nav.nav-pills.nav-stacked
%li{class: ("active" if params[:state].blank?)} %li{class: ("active" if params[:state].blank?)}
= link_to project_filter_path(state: nil) do = link_to project_filter_path(state: nil) do
Open Open
%li{class: ("active" if params[:state] == 'closed')} %li{class: ("active" if params[:state] == 'closed')}
= link_to project_filter_path(state: 'closed') do = link_to project_filter_path(state: 'closed') do
Closed Closed
%li{class: ("active" if params[:state] == 'all')} %li{class: ("active" if params[:state] == 'all')}
= link_to project_filter_path(state: 'all') do = link_to project_filter_path(state: 'all') do
All All
%fieldset %fieldset
- if %w(state scope milestone_id assignee_id label_name).select { |k| params[k].present? }.any? - if %w(state scope milestone_id assignee_id label_name).select { |k| params[k].present? }.any?
= link_to project_entities_path, class: 'cgray pull-right' do = link_to project_entities_path, class: 'cgray pull-right' do
%i.icon-remove %i.icon-remove
%strong Clear filter %strong Clear filter
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment