Dashboard css improvements

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

4 files changed, 43 insertions, 42 deletions

diff --git a/app/views/dashboard/projects.html.haml b/app/views/dashboard/projects.html.haml
index 33bd40743dc..58812674b06 100644
--- a/app/views/dashboard/projects.html.haml
+++ b/app/views/dashboard/projects.html.haml
@@ -25,7 +25,7 @@
   All projects you have access to are listed here. Public projects are not included here unless you are a member
 %hr
 .row
-  .col-md-3
+  .col-md-3.col-sm-4
     %ul.nav.nav-pills.nav-stacked
       = nav_tab :scope, nil do
         = link_to projects_dashboard_filter_path(scope: nil) do
@@ -81,7 +81,7 @@
                 %i.icon-tag
                 = label.name
 
-  .col-md-9
+  .col-md-9.col-sm-8
     %ul.bordered-list.my-projects.top-list
       - @projects.each do |project|
         %li.my-project-row
diff --git a/app/views/dashboard/show.html.haml b/app/views/dashboard/show.html.haml
index b2198f76fb3..5a8abb25dc6 100644
--- a/app/views/dashboard/show.html.haml
+++ b/app/views/dashboard/show.html.haml
@@ -1,8 +1,8 @@
 - if @has_authorized_projects
-  .dashboard
+  .dashboard.row
     .activities.col-md-8
       = render 'activities'
-    .side.col-md-4
+    .side.col-md-4.hidden-xs.hidden-sm
       = render 'sidebar'
 
 - else
diff --git a/app/views/shared/_filter.html.haml b/app/views/shared/_filter.html.haml
index 13bda305d77..182836e933e 100644
--- a/app/views/shared/_filter.html.haml
+++ b/app/views/shared/_filter.html.haml
@@ -1,41 +1,42 @@
-= form_tag filter_path(entity), method: 'get' do
-  %fieldset.scope-filter
-    %ul.nav.nav-pills.nav-stacked
-      %li{class: ("active" if params[:scope].blank?)}
-        = link_to filter_path(entity, scope: nil) do
-          Assigned to me
-      %li{class: ("active" if params[:scope] == 'authored')}
-        = link_to filter_path(entity, scope: 'authored') do
-          Created by me
-      %li{class: ("active" if params[:scope] == 'all')}
-        = link_to filter_path(entity, scope: 'all') do
-          All
+.side-filters
+  = form_tag filter_path(entity), method: 'get' do
+    %fieldset.scope-filter
+      %ul.nav.nav-pills.nav-stacked
+        %li{class: ("active" if params[:scope].blank?)}
+          = link_to filter_path(entity, scope: nil) do
+            Assigned to me
+        %li{class: ("active" if params[:scope] == 'authored')}
+          = link_to filter_path(entity, scope: 'authored') do
+            Created by me
+        %li{class: ("active" if params[:scope] == 'all')}
+          = link_to filter_path(entity, scope: 'all') do
+            All
 
-  %fieldset.status-filter
-    %ul.nav.nav-pills.nav-stacked
-      %li{class: ("active" if params[:status].blank?)}
-        = link_to filter_path(entity, status: nil) do
-          Open
-      %li{class: ("active" if params[:status] == 'closed')}
-        = link_to filter_path(entity, status: 'closed') do
-          Closed
-      %li{class: ("active" if params[:status] == 'all')}
-        = link_to filter_path(entity, status: 'all') do
-          All
+    %fieldset.status-filter
+      %ul.nav.nav-pills.nav-stacked
+        %li{class: ("active" if params[:status].blank?)}
+          = link_to filter_path(entity, status: nil) do
+            Open
+        %li{class: ("active" if params[:status] == 'closed')}
+          = link_to filter_path(entity, status: 'closed') do
+            Closed
+        %li{class: ("active" if params[:status] == 'all')}
+          = link_to filter_path(entity, status: 'all') do
+            All
 
-  %fieldset
-    %legend Projects
-    %ul.nav.nav-pills.nav-pills-small.nav-stacked
-      - @projects.each do |project|
-        - unless entities_per_project(project, entity).zero?
-          %li{class: ("active" if params[:project_id] == project.id.to_s)}
-            = link_to filter_path(entity, project_id: project.id) do
-              = project.name_with_namespace
-              %small.pull-right= entities_per_project(project, entity)
+    %fieldset.hidden-xs.hidden-sm
+      %legend Projects
+      %ul.nav.nav-pills.nav-pills-small.nav-stacked
+        - @projects.each do |project|
+          - unless entities_per_project(project, entity).zero?
+            %li{class: ("active" if params[:project_id] == project.id.to_s)}
+              = link_to filter_path(entity, project_id: project.id) do
+                = project.name_with_namespace
+                %small.pull-right= entities_per_project(project, entity)
 
-  %fieldset
-    - if params[:status].present? || params[:project_id].present?
-      = link_to filter_path(entity, status: nil, project_id: nil), class: 'pull-right cgray' do
-        %i.icon-remove
-        %strong Clear filter
+    %fieldset
+      - if params[:status].present? || params[:project_id].present?
+        = link_to filter_path(entity, status: nil, project_id: nil), class: 'pull-right cgray' do
+          %i.icon-remove
+          %strong Clear filter
 
diff --git a/app/views/shared/_no_ssh.html.haml b/app/views/shared/_no_ssh.html.haml
index 62093a294a6..077e6c6a808 100644
--- a/app/views/shared/_no_ssh.html.haml
+++ b/app/views/shared/_no_ssh.html.haml
@@ -1,4 +1,4 @@
-- if cookies[:hide_no_ssh_message].blank? && current_user.require_ssh_key? && !current_user.gl-hide_no_ssh_key
+- if cookies[:hide_no_ssh_message].blank? && current_user.require_ssh_key? && !current_user.hide_no_ssh_key
   .no-ssh-key-message
     .container
       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