Merge branch 'improve-sidebar' into 'master'

Improve sidebar menu for project settings

See merge request !1582

app/assets/stylesheets/sections/nav_sidebar.scss

@@ -47,7 +47,7 @@
     border-left: 3px solid $style_color;
 
     &.no-highlight {
-      background: none;
+      background: none !important;
       border: none;
     }
 

app/views/layouts/nav/_project.html.haml

@@ -6,12 +6,7 @@
         %span
           Back to project
 
-    = nav_link(html_options: {class: "#{project_tab_class} separate-item"}) do
-      = link_to edit_namespace_project_path(@project.namespace, @project), title: 'Settings', class: "stat-tab tab no-highlight" do
-        %i.fa.fa-cogs
-        %span
-          Settings
-          %i.fa.fa-angle-down
+    %li.separate-item
 
     = render 'projects/settings_nav'
 
@@ -98,4 +93,3 @@
           %i.fa.fa-cogs
           %span
             Settings
-            %i.fa.fa-angle-down

features/steps/shared/project_tab.rb

@@ -41,6 +41,8 @@ module SharedProjectTab
   end
 
   step 'the active main tab should be Settings' do
-    ensure_active_main_tab('Settings')
+    within '.nav-sidebar' do
+      page.should have_content('Back to project')
+    end
   end
 end