Download as
Browse Code »

Commit 57ab639c0dec366a7aecbe69490f0662f477ecd0

Authored by Dmitriy Zaporozhets
1 parent 0392669c
Exists in spb-stable and in 3 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb

Dashboard css improvements 

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Showing 6 changed files with 49 additions and 49 deletions   Show diff stats
app/assets/stylesheets/common.scss
  Diff comments   View file @57ab639
@@ -395,3 +395,9 @@ table { @@ -395,3 +395,9 @@ table {
395 font-weight: bolder; 395 font-weight: bolder;
396 } 396 }
397 } 397 }
  398 +
  399 +.side-filters {
  400 + fieldset {
  401 + margin-bottom: 15px;
  402 + }
  403 +}
app/assets/stylesheets/sections/dashboard.scss
  Diff comments   View file @57ab639
1 .dashboard { 1 .dashboard {
2 - @extend .row;  
3 - .activities {  
4 - }  
5 -  
6 .side { 2 .side {
7 - @extend .pull-right;  
8 -  
9 .ui-box { 3 .ui-box {
10 margin: 0px; 4 margin: 0px;
11 box-shadow: none; 5 box-shadow: none;
@@ -108,7 +102,6 @@ @@ -108,7 +102,6 @@
108 padding: 8px 12px; 102 padding: 8px 12px;
109 border-radius: 50px; 103 border-radius: 50px;
110 background: #f5f5f5; 104 background: #f5f5f5;
111 - width: 16px;  
112 text-align: center; 105 text-align: center;
113 106
114 i { 107 i {
app/views/dashboard/projects.html.haml
  Diff comments   View file @57ab639
@@ -25,7 +25,7 @@ @@ -25,7 +25,7 @@
25 All projects you have access to are listed here. Public projects are not included here unless you are a member 25 All projects you have access to are listed here. Public projects are not included here unless you are a member
26 %hr 26 %hr
27 .row 27 .row
28 - .col-md-3 28 + .col-md-3.col-sm-4
29 %ul.nav.nav-pills.nav-stacked 29 %ul.nav.nav-pills.nav-stacked
30 = nav_tab :scope, nil do 30 = nav_tab :scope, nil do
31 = link_to projects_dashboard_filter_path(scope: nil) do 31 = link_to projects_dashboard_filter_path(scope: nil) do
@@ -81,7 +81,7 @@ @@ -81,7 +81,7 @@
81 %i.icon-tag 81 %i.icon-tag
82 = label.name 82 = label.name
83 83
84 - .col-md-9 84 + .col-md-9.col-sm-8
85 %ul.bordered-list.my-projects.top-list 85 %ul.bordered-list.my-projects.top-list
86 - @projects.each do |project| 86 - @projects.each do |project|
87 %li.my-project-row 87 %li.my-project-row
app/views/dashboard/show.html.haml
  Diff comments   View file @57ab639
1 - if @has_authorized_projects 1 - if @has_authorized_projects
2 - .dashboard 2 + .dashboard.row
3 .activities.col-md-8 3 .activities.col-md-8
4 = render 'activities' 4 = render 'activities'
5 - .side.col-md-4 5 + .side.col-md-4.hidden-xs.hidden-sm
6 = render 'sidebar' 6 = render 'sidebar'
7 7
8 - else 8 - else
app/views/shared/_filter.html.haml
  Diff comments   View file @57ab639
1 -= form_tag filter_path(entity), method: 'get' do  
2 - %fieldset.scope-filter  
3 - %ul.nav.nav-pills.nav-stacked  
4 - %li{class: ("active" if params[:scope].blank?)}  
5 - = link_to filter_path(entity, scope: nil) do  
6 - Assigned to me  
7 - %li{class: ("active" if params[:scope] == 'authored')}  
8 - = link_to filter_path(entity, scope: 'authored') do  
9 - Created by me  
10 - %li{class: ("active" if params[:scope] == 'all')}  
11 - = link_to filter_path(entity, scope: 'all') do  
12 - All 1 +.side-filters
  2 + = form_tag filter_path(entity), method: 'get' do
  3 + %fieldset.scope-filter
  4 + %ul.nav.nav-pills.nav-stacked
  5 + %li{class: ("active" if params[:scope].blank?)}
  6 + = link_to filter_path(entity, scope: nil) do
  7 + Assigned to me
  8 + %li{class: ("active" if params[:scope] == 'authored')}
  9 + = link_to filter_path(entity, scope: 'authored') do
  10 + Created by me
  11 + %li{class: ("active" if params[:scope] == 'all')}
  12 + = link_to filter_path(entity, scope: 'all') do
  13 + All
13 14
14 - %fieldset.status-filter  
15 - %ul.nav.nav-pills.nav-stacked  
16 - %li{class: ("active" if params[:status].blank?)}  
17 - = link_to filter_path(entity, status: nil) do  
18 - Open  
19 - %li{class: ("active" if params[:status] == 'closed')}  
20 - = link_to filter_path(entity, status: 'closed') do  
21 - Closed  
22 - %li{class: ("active" if params[:status] == 'all')}  
23 - = link_to filter_path(entity, status: 'all') do  
24 - All 15 + %fieldset.status-filter
  16 + %ul.nav.nav-pills.nav-stacked
  17 + %li{class: ("active" if params[:status].blank?)}
  18 + = link_to filter_path(entity, status: nil) do
  19 + Open
  20 + %li{class: ("active" if params[:status] == 'closed')}
  21 + = link_to filter_path(entity, status: 'closed') do
  22 + Closed
  23 + %li{class: ("active" if params[:status] == 'all')}
  24 + = link_to filter_path(entity, status: 'all') do
  25 + All
25 26
26 - %fieldset  
27 - %legend Projects  
28 - %ul.nav.nav-pills.nav-pills-small.nav-stacked  
29 - - @projects.each do |project|  
30 - - unless entities_per_project(project, entity).zero?  
31 - %li{class: ("active" if params[:project_id] == project.id.to_s)}  
32 - = link_to filter_path(entity, project_id: project.id) do  
33 - = project.name_with_namespace  
34 - %small.pull-right= entities_per_project(project, entity) 27 + %fieldset.hidden-xs.hidden-sm
  28 + %legend Projects
  29 + %ul.nav.nav-pills.nav-pills-small.nav-stacked
  30 + - @projects.each do |project|
  31 + - unless entities_per_project(project, entity).zero?
  32 + %li{class: ("active" if params[:project_id] == project.id.to_s)}
  33 + = link_to filter_path(entity, project_id: project.id) do
  34 + = project.name_with_namespace
  35 + %small.pull-right= entities_per_project(project, entity)
35 36
36 - %fieldset  
37 - - if params[:status].present? || params[:project_id].present?  
38 - = link_to filter_path(entity, status: nil, project_id: nil), class: 'pull-right cgray' do  
39 - %i.icon-remove  
40 - %strong Clear filter 37 + %fieldset
  38 + - if params[:status].present? || params[:project_id].present?
  39 + = link_to filter_path(entity, status: nil, project_id: nil), class: 'pull-right cgray' do
  40 + %i.icon-remove
  41 + %strong Clear filter
41 42
app/views/shared/_no_ssh.html.haml
  Diff comments   View file @57ab639
1 -- if cookies[:hide_no_ssh_message].blank? && current_user.require_ssh_key? && !current_user.gl-hide_no_ssh_key 1 +- if cookies[:hide_no_ssh_message].blank? && current_user.require_ssh_key? && !current_user.hide_no_ssh_key
2 .no-ssh-key-message 2 .no-ssh-key-message
3 .container 3 .container
4 You won't be able to pull or push project code via SSH until you #{link_to 'add an SSH key', new_profile_key_path} to your profile 4 You won't be able to pull or push project code via SSH until you #{link_to 'add an SSH key', new_profile_key_path} to your profile