Some tweaks to new sidebar

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

5 files changed, 19 insertions, 18 deletions

diff --git a/app/assets/stylesheets/framework/gitlab-theme.scss b/app/assets/stylesheets/framework/gitlab-theme.scss
index 795a26ce34c..fa9038ebaca 100644
--- a/app/assets/stylesheets/framework/gitlab-theme.scss
+++ b/app/assets/stylesheets/framework/gitlab-theme.scss
@@ -33,11 +33,15 @@
       background: $color;
     }
 
+    .complex-sidebar .nav-primary {
+      border-right: 1px solid lighten($color, 3%);
+    }
+
     .sidebar-wrapper {
       background: $color-darker;
 
       .sidebar-user {
-        border-top: 1px solid $color;
+        border-top: 1px solid lighten($color, 3%);
         background: $color-darker;
         color: $color-light;
 
diff --git a/app/assets/stylesheets/framework/sidebar.scss b/app/assets/stylesheets/framework/sidebar.scss
index e55c9e3e429..c741c826ae0 100644
--- a/app/assets/stylesheets/framework/sidebar.scss
+++ b/app/assets/stylesheets/framework/sidebar.scss
@@ -296,7 +296,6 @@
   .nav-primary {
     width: 61px;
     float: left;
-    border-right: 1px solid rgba(255, 255, 255, 0.1);
     height: 100vh;
 
     .nav-sidebar {
@@ -313,17 +312,23 @@
   }
 
   .nav-secondary {
+    $nav-secondary-width: 168px;
+
     float: left;
-    width: 168px;
+    width: $nav-secondary-width;
 
     .nav-sidebar {
-      width: 168px;
+      width: $nav-secondary-width;
 
-      li a {
-        width: 168px;
+      li {
+        width: $nav-secondary-width;
 
-        i {
-          display: none;
+        a {
+          width: $nav-secondary-width;
+
+          i {
+            display: none;
+          }
         }
       }
     }
diff --git a/app/views/layouts/nav/_admin.html.haml b/app/views/layouts/nav/_admin.html.haml
index 280a1b93729..22d1d4d8597 100644
--- a/app/views/layouts/nav/_admin.html.haml
+++ b/app/views/layouts/nav/_admin.html.haml
@@ -95,7 +95,7 @@
           Spam Logs
           %span.count= number_with_delimiter(SpamLog.count(:all))
 
-  = nav_link(controller: :application_settings, html_options: { class: 'separate-item'}) do
+  = nav_link(controller: :application_settings) do
     = link_to admin_application_settings_path, title: 'Settings' do
       = icon('cogs fw')
       %span
diff --git a/app/views/layouts/nav/_group.html.haml b/app/views/layouts/nav/_group.html.haml
index a03d2c703f7..0b7de9633ec 100644
--- a/app/views/layouts/nav/_group.html.haml
+++ b/app/views/layouts/nav/_group.html.haml
@@ -34,7 +34,7 @@
       %span
         Members
   - if can?(current_user, :admin_group, @group)
-    = nav_link(html_options: { class: "" }) do
+    = nav_link do
       = link_to edit_group_path(@group), title: 'Settings' do
         = icon ('cogs fw')
         %span
diff --git a/app/views/layouts/nav/_profile.html.haml b/app/views/layouts/nav/_profile.html.haml
index 3b9d31a6fc5..cc119fd64e6 100644
--- a/app/views/layouts/nav/_profile.html.haml
+++ b/app/views/layouts/nav/_profile.html.haml
@@ -1,12 +1,4 @@
 %ul.nav.nav-sidebar
-  = nav_link do
-    = link_to root_path, title: 'Go to dashboard', class: 'back-link' do
-      = icon('caret-square-o-left fw')
-      %span
-        Go to dashboard
-
-  %li.separate-item
-
   = nav_link(path: 'profiles#show', html_options: {class: 'home'}) do
     = link_to profile_path, title: 'Profile Settings' do
       = icon('user fw')