Commit a11d25b1818d69fc003f7ef0c760eec95483825e
1 parent
b936addf
Exists in
spb-stable
and in
3 other branches
Responsive improvements
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Showing
5 changed files
with
62 additions
and
62 deletions
Show diff stats
app/views/dashboard/show.html.haml
app/views/layouts/_head_panel.html.haml
| ... | ... | @@ -8,35 +8,34 @@ |
| 8 | 8 | %span.separator |
| 9 | 9 | %h1.project_name= title |
| 10 | 10 | |
| 11 | - .hidden-xs.hidden-sm | |
| 12 | - %ul.nav.navbar-nav | |
| 11 | + %ul.nav.navbar-nav | |
| 12 | + %li | |
| 13 | + %a | |
| 14 | + %div.gl-hide.turbolink-spinner | |
| 15 | + %i.icon-refresh.icon-spin | |
| 16 | + Loading... | |
| 17 | + %li.hidden-sm | |
| 18 | + = render "layouts/search" | |
| 19 | + %li | |
| 20 | + = link_to public_root_path, title: "Public area", class: 'has_bottom_tooltip', 'data-original-title' => 'Public area' do | |
| 21 | + %i.icon-globe | |
| 22 | + %li | |
| 23 | + = link_to user_snippets_path(current_user), title: "My snippets", class: 'has_bottom_tooltip', 'data-original-title' => 'Public area' do | |
| 24 | + %i.icon-paste | |
| 25 | + - if current_user.is_admin? | |
| 13 | 26 | %li |
| 14 | - %a | |
| 15 | - %div.gl-hide.turbolink-spinner | |
| 16 | - %i.icon-refresh.icon-spin | |
| 17 | - Loading... | |
| 27 | + = link_to admin_root_path, title: "Admin area", class: 'has_bottom_tooltip', 'data-original-title' => 'Admin area' do | |
| 28 | + %i.icon-cogs | |
| 29 | + - if current_user.can_create_project? | |
| 18 | 30 | %li |
| 19 | - = render "layouts/search" | |
| 20 | - %li | |
| 21 | - = link_to public_root_path, title: "Public area", class: 'has_bottom_tooltip', 'data-original-title' => 'Public area' do | |
| 22 | - %i.icon-globe | |
| 23 | - %li | |
| 24 | - = link_to user_snippets_path(current_user), title: "My snippets", class: 'has_bottom_tooltip', 'data-original-title' => 'Public area' do | |
| 25 | - %i.icon-paste | |
| 26 | - - if current_user.is_admin? | |
| 27 | - %li | |
| 28 | - = link_to admin_root_path, title: "Admin area", class: 'has_bottom_tooltip', 'data-original-title' => 'Admin area' do | |
| 29 | - %i.icon-cogs | |
| 30 | - - if current_user.can_create_project? | |
| 31 | - %li | |
| 32 | - = link_to new_project_path, title: "New project", class: 'has_bottom_tooltip', 'data-original-title' => 'New project' do | |
| 33 | - %i.icon-plus | |
| 34 | - %li | |
| 35 | - = link_to profile_path, title: "Profile settings", class: 'has_bottom_tooltip', 'data-original-title' => 'Profile settings"' do | |
| 36 | - %i.icon-user | |
| 37 | - %li | |
| 38 | - = link_to destroy_user_session_path, class: "logout", method: :delete, title: "Logout", class: 'has_bottom_tooltip', 'data-original-title' => 'Logout' do | |
| 39 | - %i.icon-signout | |
| 40 | - %li | |
| 41 | - = link_to current_user, class: "profile-pic", id: 'profile-pic' do | |
| 42 | - = image_tag avatar_icon(current_user.email, 26), alt: 'User activity' | |
| 31 | + = link_to new_project_path, title: "New project", class: 'has_bottom_tooltip', 'data-original-title' => 'New project' do | |
| 32 | + %i.icon-plus | |
| 33 | + %li | |
| 34 | + = link_to profile_path, title: "Profile settings", class: 'has_bottom_tooltip', 'data-original-title' => 'Profile settings"' do | |
| 35 | + %i.icon-user | |
| 36 | + %li | |
| 37 | + = link_to destroy_user_session_path, class: "logout", method: :delete, title: "Logout", class: 'has_bottom_tooltip', 'data-original-title' => 'Logout' do | |
| 38 | + %i.icon-signout | |
| 39 | + %li | |
| 40 | + = link_to current_user, class: "profile-pic", id: 'profile-pic' do | |
| 41 | + = image_tag avatar_icon(current_user.email, 26), alt: 'User activity' | ... | ... |
app/views/projects/issues/_head.html.haml
| ... | ... | @@ -18,7 +18,7 @@ |
| 18 | 18 | %li.pull-right |
| 19 | 19 | .pull-right |
| 20 | 20 | = form_tag project_issues_path(@project), method: :get, id: "issue_search_form", class: 'inline issue-search-form' do |
| 21 | - .append-right-10 | |
| 21 | + .append-right-10.hidden-xs.hidden-sm | |
| 22 | 22 | = search_field_tag :issue_search, nil, { placeholder: 'Filter by title or description', class: 'form-control issue_search search-text-input' } |
| 23 | 23 | - if can? current_user, :write_issue, @project |
| 24 | 24 | = 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 | ... | ... |
app/views/shared/_filter.html.haml
| 1 | -.side-filters | |
| 1 | +.side-filters.hidden-xs.hidden-sm | |
| 2 | 2 | = form_tag filter_path(entity), method: 'get' do |
| 3 | 3 | %fieldset.scope-filter |
| 4 | 4 | %ul.nav.nav-pills.nav-stacked |
| ... | ... | @@ -24,7 +24,7 @@ |
| 24 | 24 | = link_to filter_path(entity, status: 'all') do |
| 25 | 25 | All |
| 26 | 26 | |
| 27 | - %fieldset.hidden-xs.hidden-sm | |
| 27 | + %fieldset | |
| 28 | 28 | %legend Projects |
| 29 | 29 | %ul.nav.nav-pills.nav-pills-small.nav-stacked |
| 30 | 30 | - @projects.each do |project| | ... | ... |
app/views/shared/_project_filter.html.haml
| 1 | -= form_tag project_entities_path, method: 'get' do | |
| 2 | - %fieldset | |
| 3 | - - if current_user | |
| 4 | - %ul.nav.nav-pills.nav-stacked | |
| 5 | - %li{class: ("active" if params[:scope].blank?)} | |
| 6 | - = link_to project_filter_path(scope: nil) do | |
| 7 | - Everyone's | |
| 8 | - %li{class: ("active" if params[:scope] == 'assigned-to-me')} | |
| 9 | - = link_to project_filter_path(scope: 'assigned-to-me') do | |
| 10 | - Assigned to me | |
| 11 | - %li{class: ("active" if params[:scope] == 'created-by-me')} | |
| 12 | - = link_to project_filter_path(scope: 'created-by-me') do | |
| 13 | - Created by me | |
| 1 | +.side-filters.hidden-xs.hidden-sm | |
| 2 | + = form_tag project_entities_path, method: 'get' do | |
| 3 | + %fieldset | |
| 4 | + - if current_user | |
| 5 | + %ul.nav.nav-pills.nav-stacked | |
| 6 | + %li{class: ("active" if params[:scope].blank?)} | |
| 7 | + = link_to project_filter_path(scope: nil) do | |
| 8 | + Everyone's | |
| 9 | + %li{class: ("active" if params[:scope] == 'assigned-to-me')} | |
| 10 | + = link_to project_filter_path(scope: 'assigned-to-me') do | |
| 11 | + Assigned to me | |
| 12 | + %li{class: ("active" if params[:scope] == 'created-by-me')} | |
| 13 | + = link_to project_filter_path(scope: 'created-by-me') do | |
| 14 | + Created by me | |
| 14 | 15 | |
| 15 | - %ul.nav.nav-pills.nav-stacked | |
| 16 | - %li{class: ("active" if params[:state].blank?)} | |
| 17 | - = link_to project_filter_path(state: nil) do | |
| 18 | - Open | |
| 19 | - %li{class: ("active" if params[:state] == 'closed')} | |
| 20 | - = link_to project_filter_path(state: 'closed') do | |
| 21 | - Closed | |
| 22 | - %li{class: ("active" if params[:state] == 'all')} | |
| 23 | - = link_to project_filter_path(state: 'all') do | |
| 24 | - All | |
| 16 | + %ul.nav.nav-pills.nav-stacked | |
| 17 | + %li{class: ("active" if params[:state].blank?)} | |
| 18 | + = link_to project_filter_path(state: nil) do | |
| 19 | + Open | |
| 20 | + %li{class: ("active" if params[:state] == 'closed')} | |
| 21 | + = link_to project_filter_path(state: 'closed') do | |
| 22 | + Closed | |
| 23 | + %li{class: ("active" if params[:state] == 'all')} | |
| 24 | + = link_to project_filter_path(state: 'all') do | |
| 25 | + All | |
| 25 | 26 | |
| 26 | - %fieldset | |
| 27 | - - if %w(state scope milestone_id assignee_id label_name).select { |k| params[k].present? }.any? | |
| 28 | - = link_to project_entities_path, class: 'cgray pull-right' do | |
| 29 | - %i.icon-remove | |
| 30 | - %strong Clear filter | |
| 27 | + %fieldset | |
| 28 | + - if %w(state scope milestone_id assignee_id label_name).select { |k| params[k].present? }.any? | |
| 29 | + = link_to project_entities_path, class: 'cgray pull-right' do | |
| 30 | + %i.icon-remove | |
| 31 | + %strong Clear filter | |
| 31 | 32 | |
| 32 | 33 | ... | ... |