From 18dd525d0f163b65893fd3df7d09185e72fc7a1e Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Fri, 1 Apr 2016 16:58:28 +0200
Subject: Concept of 2 level navigation sidebar

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
---
 app/assets/stylesheets/framework/sidebar.scss |  53 +++++++
 app/views/layouts/nav/_project.html.haml      | 215 ++++++++++++--------------
 2 files changed, 155 insertions(+), 113 deletions(-)

diff --git a/app/assets/stylesheets/framework/sidebar.scss b/app/assets/stylesheets/framework/sidebar.scss
index 18189e985c4..c042684dd71 100644
--- a/app/assets/stylesheets/framework/sidebar.scss
+++ b/app/assets/stylesheets/framework/sidebar.scss
@@ -309,3 +309,56 @@
     padding-right: $sidebar_collapsed_width;
   }
 }
+
+.page-sidebar-expanded {
+  .complex-sidebar {
+    margin-bottom: 100px;
+    display: inline-block;
+
+    .nav-sidebar {
+      margin-bottom: 0;
+    }
+
+    .nav-primary {
+      width: 60px;
+      float: left;
+
+      .nav-sidebar {
+        width: 60px;
+
+        li a {
+          width: 60px;
+
+          span {
+            display: none;
+          }
+        }
+      }
+    }
+
+    .nav-secondary {
+      border-left: 1px solid rgba(255, 255, 255, 0.1);
+      float: left;
+      width: 168px;
+
+      .nav-sidebar {
+        width: 168px;
+
+        li a {
+          width: 168px;
+
+          i {
+            display: none;
+          }
+        }
+      }
+    }
+  }
+}
+
+.page-sidebar-collapsed {
+  .nav-secondary {
+    display: none;
+    transition-duration: .3s;
+  }
+}
diff --git a/app/views/layouts/nav/_project.html.haml b/app/views/layouts/nav/_project.html.haml
index 86b46e8c75e..8fdbf5b6022 100644
--- a/app/views/layouts/nav/_project.html.haml
+++ b/app/views/layouts/nav/_project.html.haml
@@ -1,126 +1,115 @@
-%ul.nav.nav-sidebar
-  - if @project.group
-    = nav_link do
-      = link_to group_path(@project.group), title: 'Go to group', class: 'back-link' do
-        = icon('caret-square-o-left fw')
-        %span
-          Go to group
-  - else
-    = 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
+.complex-sidebar
+  .nav-primary
+    = render 'layouts/nav/dashboard'
+  .nav-secondary
+    %ul.nav.nav-sidebar
+      = nav_link(path: 'projects#show', html_options: {class: 'home'}) do
+        = link_to project_path(@project), title: 'Project', class: 'shortcuts-project' do
+          = icon('bookmark fw')
+          %span
+            Project
+      = nav_link(path: 'projects#activity') do
+        = link_to activity_project_path(@project), title: 'Activity', class: 'shortcuts-project-activity' do
+          = icon('dashboard fw')
+          %span
+            Activity
+      - if project_nav_tab? :files
+        = nav_link(controller: %w(tree blob blame edit_tree new_tree find_file)) do
+          = link_to project_files_path(@project), title: 'Files',  class: 'shortcuts-tree' do
+            = icon('files-o fw')
+            %span
+              Files
 
-  %li.separate-item
+      - if project_nav_tab? :commits
+        = nav_link(controller: %w(commit commits compare repositories tags branches releases network)) do
+          = link_to project_commits_path(@project), title: 'Commits', class: 'shortcuts-commits' do
+            = icon('history fw')
+            %span
+              Commits
 
-  = nav_link(path: 'projects#show', html_options: {class: 'home'}) do
-    = link_to project_path(@project), title: 'Project', class: 'shortcuts-project' do
-      = icon('bookmark fw')
-      %span
-        Project
-  = nav_link(path: 'projects#activity') do
-    = link_to activity_project_path(@project), title: 'Activity', class: 'shortcuts-project-activity' do
-      = icon('dashboard fw')
-      %span
-        Activity
-  - if project_nav_tab? :files
-    = nav_link(controller: %w(tree blob blame edit_tree new_tree find_file)) do
-      = link_to project_files_path(@project), title: 'Files',  class: 'shortcuts-tree' do
-        = icon('files-o fw')
-        %span
-          Files
+      - if project_nav_tab? :builds
+        = nav_link(controller: %w(builds)) do
+          = link_to project_builds_path(@project), title: 'Builds', class: 'shortcuts-builds' do
+            = icon('cubes fw')
+            %span
+              Builds
+              %span.count.builds_counter= number_with_delimiter(@project.builds.running_or_pending.count(:all))
 
-  - if project_nav_tab? :commits
-    = nav_link(controller: %w(commit commits compare repositories tags branches releases network)) do
-      = link_to project_commits_path(@project), title: 'Commits', class: 'shortcuts-commits' do
-        = icon('history fw')
-        %span
-          Commits
+      - if project_nav_tab? :graphs
+        = nav_link(controller: %w(graphs)) do
+          = link_to namespace_project_graph_path(@project.namespace, @project, current_ref), title: 'Graphs',  class: 'shortcuts-graphs' do
+            = icon('area-chart fw')
+            %span
+              Graphs
 
-  - if project_nav_tab? :builds
-    = nav_link(controller: %w(builds)) do
-      = link_to project_builds_path(@project), title: 'Builds', class: 'shortcuts-builds' do
-        = icon('cubes fw')
-        %span
-          Builds
-          %span.count.builds_counter= number_with_delimiter(@project.builds.running_or_pending.count(:all))
+      - if project_nav_tab? :milestones
+        = nav_link(controller: :milestones) do
+          = link_to namespace_project_milestones_path(@project.namespace, @project), title: 'Milestones' do
+            = icon('clock-o fw')
+            %span
+              Milestones
 
-  - if project_nav_tab? :graphs
-    = nav_link(controller: %w(graphs)) do
-      = link_to namespace_project_graph_path(@project.namespace, @project, current_ref), title: 'Graphs',  class: 'shortcuts-graphs' do
-        = icon('area-chart fw')
-        %span
-          Graphs
+      - if project_nav_tab? :issues
+        = nav_link(controller: :issues) do
+          = link_to url_for_project_issues(@project, only_path: true), title: 'Issues', class: 'shortcuts-issues' do
+            = icon('exclamation-circle fw')
+            %span
+              Issues
+              - if @project.default_issues_tracker?
+                %span.count.issue_counter= number_with_delimiter(@project.issues.visible_to_user(current_user).opened.count)
 
-  - if project_nav_tab? :milestones
-    = nav_link(controller: :milestones) do
-      = link_to namespace_project_milestones_path(@project.namespace, @project), title: 'Milestones' do
-        = icon('clock-o fw')
-        %span
-          Milestones
+      - if project_nav_tab? :merge_requests
+        = nav_link(controller: :merge_requests) do
+          = link_to namespace_project_merge_requests_path(@project.namespace, @project), title: 'Merge Requests', class: 'shortcuts-merge_requests' do
+            = icon('tasks fw')
+            %span
+              Merge Requests
+              %span.count.merge_counter= number_with_delimiter(@project.merge_requests.opened.count)
 
-  - if project_nav_tab? :issues
-    = nav_link(controller: :issues) do
-      = link_to url_for_project_issues(@project, only_path: true), title: 'Issues', class: 'shortcuts-issues' do
-        = icon('exclamation-circle fw')
-        %span
-          Issues
-          - if @project.default_issues_tracker?
-            %span.count.issue_counter= number_with_delimiter(@project.issues.visible_to_user(current_user).opened.count)
+      - if project_nav_tab? :settings
+        = nav_link(controller: [:project_members, :teams]) do
+          = link_to namespace_project_project_members_path(@project.namespace, @project), title: 'Members', class: 'team-tab tab' do
+            = icon('users fw')
+            %span
+              Members
 
-  - if project_nav_tab? :merge_requests
-    = nav_link(controller: :merge_requests) do
-      = link_to namespace_project_merge_requests_path(@project.namespace, @project), title: 'Merge Requests', class: 'shortcuts-merge_requests' do
-        = icon('tasks fw')
-        %span
-          Merge Requests
-          %span.count.merge_counter= number_with_delimiter(@project.merge_requests.opened.count)
+      - if project_nav_tab? :labels
+        = nav_link(controller: :labels) do
+          = link_to namespace_project_labels_path(@project.namespace, @project), title: 'Labels' do
+            = icon('tags fw')
+            %span
+              Labels
 
-  - if project_nav_tab? :settings
-    = nav_link(controller: [:project_members, :teams]) do
-      = link_to namespace_project_project_members_path(@project.namespace, @project), title: 'Members', class: 'team-tab tab' do
-        = icon('users fw')
-        %span
-          Members
+      - if project_nav_tab? :wiki
+        = nav_link(controller: :wikis) do
+          = link_to get_project_wiki_path(@project), title: 'Wiki', class: 'shortcuts-wiki' do
+            = icon('book fw')
+            %span
+              Wiki
 
-  - if project_nav_tab? :labels
-    = nav_link(controller: :labels) do
-      = link_to namespace_project_labels_path(@project.namespace, @project), title: 'Labels' do
-        = icon('tags fw')
-        %span
-          Labels
+      - if project_nav_tab? :forks
+        = nav_link(controller: :forks, action: :index) do
+          = link_to namespace_project_forks_path(@project.namespace, @project), title: 'Forks' do
+            = icon('code-fork fw')
+            %span
+              Forks
 
-  - if project_nav_tab? :wiki
-    = nav_link(controller: :wikis) do
-      = link_to get_project_wiki_path(@project), title: 'Wiki', class: 'shortcuts-wiki' do
-        = icon('book fw')
-        %span
-          Wiki
+      - if project_nav_tab? :snippets
+        = nav_link(controller: :snippets) do
+          = link_to namespace_project_snippets_path(@project.namespace, @project), title: 'Snippets', class: 'shortcuts-snippets' do
+            = icon('clipboard fw')
+            %span
+              Snippets
 
-  - if project_nav_tab? :forks
-    = nav_link(controller: :forks, action: :index) do
-      = link_to namespace_project_forks_path(@project.namespace, @project), title: 'Forks' do
-        = icon('code-fork fw')
-        %span
-          Forks
+      - if project_nav_tab? :settings
+        = nav_link(html_options: {class: "#{project_tab_class} separate-item"}) do
+          = link_to edit_project_path(@project), title: 'Settings' do
+            = icon('cogs fw')
+            %span
+              Settings
 
-  - if project_nav_tab? :snippets
-    = nav_link(controller: :snippets) do
-      = link_to namespace_project_snippets_path(@project.namespace, @project), title: 'Snippets', class: 'shortcuts-snippets' do
-        = icon('clipboard fw')
-        %span
-          Snippets
-
-  - if project_nav_tab? :settings
-    = nav_link(html_options: {class: "#{project_tab_class} separate-item"}) do
-      = link_to edit_project_path(@project), title: 'Settings' do
-        = icon('cogs fw')
-        %span
-          Settings
-
-  -# Global shortcut to network page for compatibility
-  - if project_nav_tab? :network
-    %li.hidden
-      = link_to namespace_project_network_path(@project.namespace, @project, current_ref), title: 'Network', class: 'shortcuts-network' do
-        Network
+      -# Global shortcut to network page for compatibility
+      - if project_nav_tab? :network
+        %li.hidden
+          = link_to namespace_project_network_path(@project.namespace, @project, current_ref), title: 'Network', class: 'shortcuts-network' do
+            Network
-- 
cgit v1.2.1


From dbc96f05d0c7dd6118a0deeea97650417e42917f Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Fri, 1 Apr 2016 18:24:03 +0200
Subject: Refactor left navigation sidebar to use 2 levels

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
---
 app/assets/stylesheets/framework/gitlab-theme.scss |   1 +
 app/assets/stylesheets/framework/sidebar.scss      |   2 +-
 app/views/layouts/_page.html.haml                  |  14 +-
 app/views/layouts/nav/_dashboard.html.haml         |   1 -
 app/views/layouts/nav/_project.html.haml           | 200 ++++++++++-----------
 5 files changed, 109 insertions(+), 109 deletions(-)

diff --git a/app/assets/stylesheets/framework/gitlab-theme.scss b/app/assets/stylesheets/framework/gitlab-theme.scss
index c83cf881596..ad6ade1304e 100644
--- a/app/assets/stylesheets/framework/gitlab-theme.scss
+++ b/app/assets/stylesheets/framework/gitlab-theme.scss
@@ -37,6 +37,7 @@
       background: $color-darker;
 
       .sidebar-user {
+        border-top: 1px solid $color;
         background: $color-darker;
         color: $color-light;
 
diff --git a/app/assets/stylesheets/framework/sidebar.scss b/app/assets/stylesheets/framework/sidebar.scss
index c042684dd71..8d0b0112cdf 100644
--- a/app/assets/stylesheets/framework/sidebar.scss
+++ b/app/assets/stylesheets/framework/sidebar.scss
@@ -312,7 +312,6 @@
 
 .page-sidebar-expanded {
   .complex-sidebar {
-    margin-bottom: 100px;
     display: inline-block;
 
     .nav-sidebar {
@@ -337,6 +336,7 @@
     }
 
     .nav-secondary {
+      padding-bottom: 100px;
       border-left: 1px solid rgba(255, 255, 255, 0.1);
       float: left;
       width: 168px;
diff --git a/app/views/layouts/_page.html.haml b/app/views/layouts/_page.html.haml
index c799e9c588d..fcf61094a25 100644
--- a/app/views/layouts/_page.html.haml
+++ b/app/views/layouts/_page.html.haml
@@ -8,12 +8,16 @@
         .gitlab-text-container
           %h3 GitLab
 
-    - if defined?(sidebar) && sidebar
-      = render "layouts/nav/#{sidebar}"
-    - elsif current_user
-      = render 'layouts/nav/dashboard'
+    - primary_sidebar = current_user ? 'dashboard' : 'explore'
+
+    - if defined?(sidebar) && sidebar && sidebar != primary_sidebar
+      .complex-sidebar
+        .nav-primary
+          = render "layouts/nav/#{primary_sidebar}"
+        .nav-secondary
+          = render "layouts/nav/#{sidebar}"
     - else
-      = render 'layouts/nav/explore'
+      = render "layouts/nav/#{primary_sidebar}"
 
     .collapse-nav
       = render partial: 'layouts/collapse_button'
diff --git a/app/views/layouts/nav/_dashboard.html.haml b/app/views/layouts/nav/_dashboard.html.haml
index 4a0069f18f8..866ebfc6f05 100644
--- a/app/views/layouts/nav/_dashboard.html.haml
+++ b/app/views/layouts/nav/_dashboard.html.haml
@@ -48,7 +48,6 @@
       %span
         Help
 
-  %li.separate-item
   = nav_link(controller: :profile) do
     = link_to profile_path, title: 'Profile Settings', data: {placement: 'bottom'} do
       = icon('user fw')
diff --git a/app/views/layouts/nav/_project.html.haml b/app/views/layouts/nav/_project.html.haml
index 8fdbf5b6022..d0f82b5f57f 100644
--- a/app/views/layouts/nav/_project.html.haml
+++ b/app/views/layouts/nav/_project.html.haml
@@ -1,115 +1,111 @@
-.complex-sidebar
-  .nav-primary
-    = render 'layouts/nav/dashboard'
-  .nav-secondary
-    %ul.nav.nav-sidebar
-      = nav_link(path: 'projects#show', html_options: {class: 'home'}) do
-        = link_to project_path(@project), title: 'Project', class: 'shortcuts-project' do
-          = icon('bookmark fw')
-          %span
-            Project
-      = nav_link(path: 'projects#activity') do
-        = link_to activity_project_path(@project), title: 'Activity', class: 'shortcuts-project-activity' do
-          = icon('dashboard fw')
-          %span
-            Activity
-      - if project_nav_tab? :files
-        = nav_link(controller: %w(tree blob blame edit_tree new_tree find_file)) do
-          = link_to project_files_path(@project), title: 'Files',  class: 'shortcuts-tree' do
-            = icon('files-o fw')
-            %span
-              Files
+%ul.nav.nav-sidebar
+  = nav_link(path: 'projects#show', html_options: {class: 'home'}) do
+    = link_to project_path(@project), title: 'Project', class: 'shortcuts-project' do
+      = icon('bookmark fw')
+      %span
+        Project
+  = nav_link(path: 'projects#activity') do
+    = link_to activity_project_path(@project), title: 'Activity', class: 'shortcuts-project-activity' do
+      = icon('dashboard fw')
+      %span
+        Activity
+  - if project_nav_tab? :files
+    = nav_link(controller: %w(tree blob blame edit_tree new_tree find_file)) do
+      = link_to project_files_path(@project), title: 'Files',  class: 'shortcuts-tree' do
+        = icon('files-o fw')
+        %span
+          Files
 
-      - if project_nav_tab? :commits
-        = nav_link(controller: %w(commit commits compare repositories tags branches releases network)) do
-          = link_to project_commits_path(@project), title: 'Commits', class: 'shortcuts-commits' do
-            = icon('history fw')
-            %span
-              Commits
+  - if project_nav_tab? :commits
+    = nav_link(controller: %w(commit commits compare repositories tags branches releases network)) do
+      = link_to project_commits_path(@project), title: 'Commits', class: 'shortcuts-commits' do
+        = icon('history fw')
+        %span
+          Commits
 
-      - if project_nav_tab? :builds
-        = nav_link(controller: %w(builds)) do
-          = link_to project_builds_path(@project), title: 'Builds', class: 'shortcuts-builds' do
-            = icon('cubes fw')
-            %span
-              Builds
-              %span.count.builds_counter= number_with_delimiter(@project.builds.running_or_pending.count(:all))
+  - if project_nav_tab? :builds
+    = nav_link(controller: %w(builds)) do
+      = link_to project_builds_path(@project), title: 'Builds', class: 'shortcuts-builds' do
+        = icon('cubes fw')
+        %span
+          Builds
+          %span.count.builds_counter= number_with_delimiter(@project.builds.running_or_pending.count(:all))
 
-      - if project_nav_tab? :graphs
-        = nav_link(controller: %w(graphs)) do
-          = link_to namespace_project_graph_path(@project.namespace, @project, current_ref), title: 'Graphs',  class: 'shortcuts-graphs' do
-            = icon('area-chart fw')
-            %span
-              Graphs
+  - if project_nav_tab? :graphs
+    = nav_link(controller: %w(graphs)) do
+      = link_to namespace_project_graph_path(@project.namespace, @project, current_ref), title: 'Graphs',  class: 'shortcuts-graphs' do
+        = icon('area-chart fw')
+        %span
+          Graphs
 
-      - if project_nav_tab? :milestones
-        = nav_link(controller: :milestones) do
-          = link_to namespace_project_milestones_path(@project.namespace, @project), title: 'Milestones' do
-            = icon('clock-o fw')
-            %span
-              Milestones
+  - if project_nav_tab? :milestones
+    = nav_link(controller: :milestones) do
+      = link_to namespace_project_milestones_path(@project.namespace, @project), title: 'Milestones' do
+        = icon('clock-o fw')
+        %span
+          Milestones
 
-      - if project_nav_tab? :issues
-        = nav_link(controller: :issues) do
-          = link_to url_for_project_issues(@project, only_path: true), title: 'Issues', class: 'shortcuts-issues' do
-            = icon('exclamation-circle fw')
-            %span
-              Issues
-              - if @project.default_issues_tracker?
-                %span.count.issue_counter= number_with_delimiter(@project.issues.visible_to_user(current_user).opened.count)
+  - if project_nav_tab? :issues
+    = nav_link(controller: :issues) do
+      = link_to url_for_project_issues(@project, only_path: true), title: 'Issues', class: 'shortcuts-issues' do
+        = icon('exclamation-circle fw')
+        %span
+          Issues
+          - if @project.default_issues_tracker?
+            %span.count.issue_counter= number_with_delimiter(@project.issues.visible_to_user(current_user).opened.count)
 
-      - if project_nav_tab? :merge_requests
-        = nav_link(controller: :merge_requests) do
-          = link_to namespace_project_merge_requests_path(@project.namespace, @project), title: 'Merge Requests', class: 'shortcuts-merge_requests' do
-            = icon('tasks fw')
-            %span
-              Merge Requests
-              %span.count.merge_counter= number_with_delimiter(@project.merge_requests.opened.count)
+  - if project_nav_tab? :merge_requests
+    = nav_link(controller: :merge_requests) do
+      = link_to namespace_project_merge_requests_path(@project.namespace, @project), title: 'Merge Requests', class: 'shortcuts-merge_requests' do
+        = icon('tasks fw')
+        %span
+          Merge Requests
+          %span.count.merge_counter= number_with_delimiter(@project.merge_requests.opened.count)
 
-      - if project_nav_tab? :settings
-        = nav_link(controller: [:project_members, :teams]) do
-          = link_to namespace_project_project_members_path(@project.namespace, @project), title: 'Members', class: 'team-tab tab' do
-            = icon('users fw')
-            %span
-              Members
+  - if project_nav_tab? :settings
+    = nav_link(controller: [:project_members, :teams]) do
+      = link_to namespace_project_project_members_path(@project.namespace, @project), title: 'Members', class: 'team-tab tab' do
+        = icon('users fw')
+        %span
+          Members
 
-      - if project_nav_tab? :labels
-        = nav_link(controller: :labels) do
-          = link_to namespace_project_labels_path(@project.namespace, @project), title: 'Labels' do
-            = icon('tags fw')
-            %span
-              Labels
+  - if project_nav_tab? :labels
+    = nav_link(controller: :labels) do
+      = link_to namespace_project_labels_path(@project.namespace, @project), title: 'Labels' do
+        = icon('tags fw')
+        %span
+          Labels
 
-      - if project_nav_tab? :wiki
-        = nav_link(controller: :wikis) do
-          = link_to get_project_wiki_path(@project), title: 'Wiki', class: 'shortcuts-wiki' do
-            = icon('book fw')
-            %span
-              Wiki
+  - if project_nav_tab? :wiki
+    = nav_link(controller: :wikis) do
+      = link_to get_project_wiki_path(@project), title: 'Wiki', class: 'shortcuts-wiki' do
+        = icon('book fw')
+        %span
+          Wiki
 
-      - if project_nav_tab? :forks
-        = nav_link(controller: :forks, action: :index) do
-          = link_to namespace_project_forks_path(@project.namespace, @project), title: 'Forks' do
-            = icon('code-fork fw')
-            %span
-              Forks
+  - if project_nav_tab? :forks
+    = nav_link(controller: :forks, action: :index) do
+      = link_to namespace_project_forks_path(@project.namespace, @project), title: 'Forks' do
+        = icon('code-fork fw')
+        %span
+          Forks
 
-      - if project_nav_tab? :snippets
-        = nav_link(controller: :snippets) do
-          = link_to namespace_project_snippets_path(@project.namespace, @project), title: 'Snippets', class: 'shortcuts-snippets' do
-            = icon('clipboard fw')
-            %span
-              Snippets
+  - if project_nav_tab? :snippets
+    = nav_link(controller: :snippets) do
+      = link_to namespace_project_snippets_path(@project.namespace, @project), title: 'Snippets', class: 'shortcuts-snippets' do
+        = icon('clipboard fw')
+        %span
+          Snippets
 
-      - if project_nav_tab? :settings
-        = nav_link(html_options: {class: "#{project_tab_class} separate-item"}) do
-          = link_to edit_project_path(@project), title: 'Settings' do
-            = icon('cogs fw')
-            %span
-              Settings
+  - if project_nav_tab? :settings
+    = nav_link(html_options: {class: "#{project_tab_class}"}) do
+      = link_to edit_project_path(@project), title: 'Settings' do
+        = icon('cogs fw')
+        %span
+          Settings
 
-      -# Global shortcut to network page for compatibility
-      - if project_nav_tab? :network
-        %li.hidden
-          = link_to namespace_project_network_path(@project.namespace, @project, current_ref), title: 'Network', class: 'shortcuts-network' do
-            Network
+  -# Global shortcut to network page for compatibility
+  - if project_nav_tab? :network
+    %li.hidden
+      = link_to namespace_project_network_path(@project.namespace, @project, current_ref), title: 'Network', class: 'shortcuts-network' do
+        Network
-- 
cgit v1.2.1


From 03f2dd90ec5c7d9b2f8d9b6254f7853733302896 Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Fri, 1 Apr 2016 19:32:39 +0200
Subject: Hide sidebar completely when collapsed

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
---
 app/assets/javascripts/sidebar.js.coffee      |  1 -
 app/assets/stylesheets/framework/header.scss  |  4 +-
 app/assets/stylesheets/framework/sidebar.scss | 66 +++++++++------------------
 app/views/layouts/_collapse_button.html.haml  |  4 --
 app/views/layouts/_page.html.haml             |  4 +-
 5 files changed, 27 insertions(+), 52 deletions(-)
 delete mode 100644 app/views/layouts/_collapse_button.html.haml

diff --git a/app/assets/javascripts/sidebar.js.coffee b/app/assets/javascripts/sidebar.js.coffee
index 860d4f438d0..e1778511240 100644
--- a/app/assets/javascripts/sidebar.js.coffee
+++ b/app/assets/javascripts/sidebar.js.coffee
@@ -4,7 +4,6 @@ expanded = 'page-sidebar-expanded'
 toggleSidebar = ->
   $('.page-with-sidebar').toggleClass("#{collapsed} #{expanded}")
   $('header').toggleClass("header-collapsed header-expanded")
-  $('.toggle-nav-collapse i').toggleClass("fa-angle-right fa-angle-left")
   $.cookie("collapsed_nav", $('.page-with-sidebar').hasClass(collapsed), { path: '/' })
 
   setTimeout ( ->
diff --git a/app/assets/stylesheets/framework/header.scss b/app/assets/stylesheets/framework/header.scss
index b3397d16016..724980b2208 100644
--- a/app/assets/stylesheets/framework/header.scss
+++ b/app/assets/stylesheets/framework/header.scss
@@ -123,11 +123,11 @@ header {
 }
 
 @mixin collapsed-header {
-  margin-left: $sidebar_collapsed_width;
+  margin-left: 40px;
 }
 
 .header-collapsed {
-  margin-left: $sidebar_collapsed_width;
+  margin-left: 40px;
 
   @media (min-width: $screen-md-min) {
     @include collapsed-header;
diff --git a/app/assets/stylesheets/framework/sidebar.scss b/app/assets/stylesheets/framework/sidebar.scss
index 8d0b0112cdf..f14433676e7 100644
--- a/app/assets/stylesheets/framework/sidebar.scss
+++ b/app/assets/stylesheets/framework/sidebar.scss
@@ -191,6 +191,27 @@
   }
 }
 
+.expand-nav a {
+  color: $gl-icon-color;
+  width: 60px;
+  position: fixed;
+  top: 0;
+  left: 0;
+  font-size: 20px;
+  background: transparent;
+  height: 59px;
+  text-align: center;
+  line-height: 59px;
+  border-bottom: 1px solid #eee;
+  transition-duration: .3s;
+  outline: none;
+  z-index: 100;
+
+  &:hover {
+    text-decoration: none;
+  }
+}
+
 .collapse-nav a {
   width: $sidebar_width;
   position: fixed;
@@ -210,55 +231,12 @@
 }
 
 .page-sidebar-collapsed {
-  padding-left: $sidebar_collapsed_width;
-
   .sidebar-wrapper {
-    width: $sidebar_collapsed_width;
-
-    .header-logo {
-      width: $sidebar_collapsed_width;
-
-      a {
-        padding-left: ($sidebar_collapsed_width - 36) / 2;
-
-        .gitlab-text-container {
-          display: none;
-        }
-      }
-    }
-
-    .nav-sidebar {
-      width: $sidebar_collapsed_width;
-
-      li {
-        width: auto;
-
-        a {
-          span {
-            display: none;
-          }
-        }
-      }
-    }
-
-    .collapse-nav a {
-      width: $sidebar_collapsed_width;
-    }
-
-    .sidebar-user {
-      padding-left: ($sidebar_collapsed_width - 36) / 2;
-      width: $sidebar_collapsed_width;
-
-      .username {
-        display: none;
-      }
-    }
+    display: none;
   }
 }
 
 .page-sidebar-expanded {
-  padding-left: $sidebar_collapsed_width;
-
   @media (min-width: $screen-md-min) {
     padding-left: $sidebar_width;
   }
diff --git a/app/views/layouts/_collapse_button.html.haml b/app/views/layouts/_collapse_button.html.haml
deleted file mode 100644
index 2ed51d87ca1..00000000000
--- a/app/views/layouts/_collapse_button.html.haml
+++ /dev/null
@@ -1,4 +0,0 @@
-- if nav_menu_collapsed?
-  = link_to icon('angle-right'), '#', class: 'toggle-nav-collapse', title: "Open/Close"
-- else
-  = link_to icon('angle-left'), '#', class: 'toggle-nav-collapse', title: "Open/Close"
diff --git a/app/views/layouts/_page.html.haml b/app/views/layouts/_page.html.haml
index fcf61094a25..8fc1ac8b198 100644
--- a/app/views/layouts/_page.html.haml
+++ b/app/views/layouts/_page.html.haml
@@ -1,5 +1,7 @@
 .page-with-sidebar{ class: "#{page_sidebar_class} #{page_gutter_class}" }
   = render "layouts/broadcast"
+  .expand-nav
+    = link_to icon('bars'), '#', class: 'toggle-nav-collapse', title: "Open/Close"
   .sidebar-wrapper.nicescroll{ class: nav_sidebar_class }
     .header-logo
       %a#logo
@@ -20,7 +22,7 @@
       = render "layouts/nav/#{primary_sidebar}"
 
     .collapse-nav
-      = render partial: 'layouts/collapse_button'
+      = link_to icon('angle-left'), '#', class: 'toggle-nav-collapse', title: "Open/Close"
     - if current_user
       = link_to current_user, class: 'sidebar-user', title: "Profile" do
         = image_tag avatar_icon(current_user, 60), alt: 'Profile', class: 'avatar avatar s36'
-- 
cgit v1.2.1


From de6360f9048511f55a9c93e6fc848418cb6c71a5 Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Fri, 1 Apr 2016 19:51:18 +0200
Subject: Improve styling for new complex sidebar

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
---
 app/assets/stylesheets/framework/gitlab-theme.scss |  1 -
 app/assets/stylesheets/framework/sidebar.scss      | 65 +++++++++-------------
 app/views/layouts/_page.html.haml                  |  4 +-
 app/views/layouts/nav/_dashboard.html.haml         |  2 +-
 app/views/layouts/nav/_group.html.haml             | 10 +---
 5 files changed, 31 insertions(+), 51 deletions(-)

diff --git a/app/assets/stylesheets/framework/gitlab-theme.scss b/app/assets/stylesheets/framework/gitlab-theme.scss
index ad6ade1304e..795a26ce34c 100644
--- a/app/assets/stylesheets/framework/gitlab-theme.scss
+++ b/app/assets/stylesheets/framework/gitlab-theme.scss
@@ -63,7 +63,6 @@
 
         .count {
           color: $color-light;
-          background: $color-dark;
         }
       }
 
diff --git a/app/assets/stylesheets/framework/sidebar.scss b/app/assets/stylesheets/framework/sidebar.scss
index f14433676e7..e55c9e3e429 100644
--- a/app/assets/stylesheets/framework/sidebar.scss
+++ b/app/assets/stylesheets/framework/sidebar.scss
@@ -144,7 +144,7 @@
     }
 
     a {
-      padding: 7px 15px;
+      padding: 7px 12px;
       font-size: $gl-font-size;
       line-height: 24px;
       color: $gray;
@@ -169,10 +169,12 @@
       }
 
       .count {
-        float: right;
-        background: #eee;
-        padding: 0 8px;
-        @include border-radius(6px);
+        &:before {
+          content: '(';
+        }
+        &:after {
+          content: ')';
+        }
       }
 
       &.back-link i {
@@ -288,55 +290,42 @@
   }
 }
 
-.page-sidebar-expanded {
-  .complex-sidebar {
-    display: inline-block;
+.complex-sidebar {
+  display: inline-block;
 
-    .nav-sidebar {
-      margin-bottom: 0;
-    }
+  .nav-primary {
+    width: 61px;
+    float: left;
+    border-right: 1px solid rgba(255, 255, 255, 0.1);
+    height: 100vh;
 
-    .nav-primary {
+    .nav-sidebar {
       width: 60px;
-      float: left;
 
-      .nav-sidebar {
+      li a {
         width: 60px;
 
-        li a {
-          width: 60px;
-
-          span {
-            display: none;
-          }
+        span {
+          display: none;
         }
       }
     }
+  }
 
-    .nav-secondary {
-      padding-bottom: 100px;
-      border-left: 1px solid rgba(255, 255, 255, 0.1);
-      float: left;
+  .nav-secondary {
+    float: left;
+    width: 168px;
+
+    .nav-sidebar {
       width: 168px;
 
-      .nav-sidebar {
+      li a {
         width: 168px;
 
-        li a {
-          width: 168px;
-
-          i {
-            display: none;
-          }
+        i {
+          display: none;
         }
       }
     }
   }
 }
-
-.page-sidebar-collapsed {
-  .nav-secondary {
-    display: none;
-    transition-duration: .3s;
-  }
-}
diff --git a/app/views/layouts/_page.html.haml b/app/views/layouts/_page.html.haml
index 8fc1ac8b198..9be36273c7d 100644
--- a/app/views/layouts/_page.html.haml
+++ b/app/views/layouts/_page.html.haml
@@ -1,7 +1,7 @@
 .page-with-sidebar{ class: "#{page_sidebar_class} #{page_gutter_class}" }
   = render "layouts/broadcast"
   .expand-nav
-    = link_to icon('bars'), '#', class: 'toggle-nav-collapse', title: "Open/Close"
+    = link_to icon('bars'), '#', class: 'toggle-nav-collapse', title: "Open sidebar"
   .sidebar-wrapper.nicescroll{ class: nav_sidebar_class }
     .header-logo
       %a#logo
@@ -22,7 +22,7 @@
       = render "layouts/nav/#{primary_sidebar}"
 
     .collapse-nav
-      = link_to icon('angle-left'), '#', class: 'toggle-nav-collapse', title: "Open/Close"
+      = link_to icon('angle-left'), '#', class: 'toggle-nav-collapse', title: "Hide sidebar"
     - if current_user
       = link_to current_user, class: 'sidebar-user', title: "Profile" do
         = image_tag avatar_icon(current_user, 60), alt: 'Profile', class: 'avatar avatar s36'
diff --git a/app/views/layouts/nav/_dashboard.html.haml b/app/views/layouts/nav/_dashboard.html.haml
index 866ebfc6f05..dfdabd4c55d 100644
--- a/app/views/layouts/nav/_dashboard.html.haml
+++ b/app/views/layouts/nav/_dashboard.html.haml
@@ -15,7 +15,7 @@
       = icon('dashboard fw')
       %span
         Activity
-  = nav_link(controller: :groups) do
+  = nav_link(path: ['groups#index']) do
     = link_to dashboard_groups_path, title: 'Groups' do
       = icon('group fw')
       %span
diff --git a/app/views/layouts/nav/_group.html.haml b/app/views/layouts/nav/_group.html.haml
index 55940741dc0..a03d2c703f7 100644
--- a/app/views/layouts/nav/_group.html.haml
+++ b/app/views/layouts/nav/_group.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: 'groups#show', html_options: {class: 'home'}) do
     = link_to group_path(@group), title: 'Home' do
       = icon('group fw')
@@ -42,7 +34,7 @@
       %span
         Members
   - if can?(current_user, :admin_group, @group)
-    = nav_link(html_options: { class: "separate-item" }) do
+    = nav_link(html_options: { class: "" }) do
       = link_to edit_group_path(@group), title: 'Settings' do
         = icon ('cogs fw')
         %span
-- 
cgit v1.2.1


From 22479fd0ae41d16d7bbd579615ee10c4b22deeed Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Fri, 1 Apr 2016 19:53:29 +0200
Subject: Remove tests with back button

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
---
 features/groups.feature           | 4 ----
 features/project/project.feature  | 9 ---------
 features/steps/groups.rb          | 4 ----
 features/steps/project/project.rb | 8 --------
 4 files changed, 25 deletions(-)

diff --git a/features/groups.feature b/features/groups.feature
index 419a5d3963d..49e939807b5 100644
--- a/features/groups.feature
+++ b/features/groups.feature
@@ -7,10 +7,6 @@ Feature: Groups
     When I visit group "NonExistentGroup" page
     Then page status code should be 404
 
-  Scenario: I should have back to group button
-    When I visit group "Owned" page
-    Then I should see back to dashboard button
-
   @javascript
   Scenario: I should see group "Owned" dashboard list
     When I visit group "Owned" page
diff --git a/features/project/project.feature b/features/project/project.feature
index f1f3ed26065..aa22401c88e 100644
--- a/features/project/project.feature
+++ b/features/project/project.feature
@@ -18,15 +18,6 @@ Feature: Project
     Then I should see the default project avatar
     And I should not see the "Remove avatar" button
 
-  Scenario: I should have back to group button
-    And project "Shop" belongs to group
-    And I visit project "Shop" page
-    Then I should see back to group button
-
-  Scenario: I should have back to group button
-    And I visit project "Shop" page
-    Then I should see back to dashboard button
-
   Scenario: I should have readme on page
     And I visit project "Shop" page
     Then I should see project "Shop" README
diff --git a/features/steps/groups.rb b/features/steps/groups.rb
index e5b7db4c5e3..483370f41c6 100644
--- a/features/steps/groups.rb
+++ b/features/steps/groups.rb
@@ -4,10 +4,6 @@ class Spinach::Features::Groups < Spinach::FeatureSteps
   include SharedGroup
   include SharedUser
 
-  step 'I should see back to dashboard button' do
-    expect(page).to have_content 'Go to dashboard'
-  end
-
   step 'I should see group "Owned"' do
     expect(page).to have_content '@owned'
   end
diff --git a/features/steps/project/project.rb b/features/steps/project/project.rb
index ef185861e00..d24f3cc3065 100644
--- a/features/steps/project/project.rb
+++ b/features/steps/project/project.rb
@@ -123,14 +123,6 @@ class Spinach::Features::Project < Spinach::FeatureSteps
     @project.save!
   end
 
-  step 'I should see back to dashboard button' do
-    expect(page).to have_content 'Go to dashboard'
-  end
-
-  step 'I should see back to group button' do
-    expect(page).to have_content 'Go to group'
-  end
-
   step 'I click notifications drop down button' do
     click_link 'notifications-button'
   end
-- 
cgit v1.2.1


From 4a8bd9faaf04a55f84dc350dba6e425301ead716 Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Fri, 1 Apr 2016 20:34:42 +0200
Subject: Some tweaks to new sidebar

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
---
 app/assets/stylesheets/framework/gitlab-theme.scss |  6 +++++-
 app/assets/stylesheets/framework/sidebar.scss      | 19 ++++++++++++-------
 app/views/layouts/nav/_admin.html.haml             |  2 +-
 app/views/layouts/nav/_group.html.haml             |  2 +-
 app/views/layouts/nav/_profile.html.haml           |  8 --------
 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')
-- 
cgit v1.2.1


From 847940516b73977c2471d830e64a439f2d226685 Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Fri, 1 Apr 2016 22:35:49 +0200
Subject: Fix some active tab tests that are broken because of 2 level sidebar

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
---
 app/views/layouts/nav/_dashboard.html.haml | 2 +-
 features/steps/group/milestones.rb         | 4 +++-
 features/steps/project/active_tab.rb       | 4 +++-
 features/steps/shared/project_tab.rb       | 2 +-
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/app/views/layouts/nav/_dashboard.html.haml b/app/views/layouts/nav/_dashboard.html.haml
index dfdabd4c55d..dc2917df0b9 100644
--- a/app/views/layouts/nav/_dashboard.html.haml
+++ b/app/views/layouts/nav/_dashboard.html.haml
@@ -15,7 +15,7 @@
       = icon('dashboard fw')
       %span
         Activity
-  = nav_link(path: ['groups#index']) do
+  = nav_link(path: ['dashboard/groups#index', 'explore/groups#index']) do
     = link_to dashboard_groups_path, title: 'Groups' do
       = icon('group fw')
       %span
diff --git a/features/steps/group/milestones.rb b/features/steps/group/milestones.rb
index a167d259837..f047669ba3d 100644
--- a/features/steps/group/milestones.rb
+++ b/features/steps/group/milestones.rb
@@ -5,7 +5,9 @@ class Spinach::Features::GroupMilestones < Spinach::FeatureSteps
   include SharedUser
 
   step 'I click on group milestones' do
-    click_link 'Milestones'
+    within '.nav-secondary' do
+      click_link 'Milestones'
+    end
   end
 
   step 'I should see group milestones index page has no milestones' do
diff --git a/features/steps/project/active_tab.rb b/features/steps/project/active_tab.rb
index 19d81453d8c..b08eb45a452 100644
--- a/features/steps/project/active_tab.rb
+++ b/features/steps/project/active_tab.rb
@@ -82,7 +82,9 @@ class Spinach::Features::ProjectActiveTab < Spinach::FeatureSteps
   # Sub Tabs: Issues
 
   step 'I click the "Milestones" tab' do
-    click_link('Milestones')
+    within '.nav-secondary' do
+      click_link('Milestones')
+    end
   end
 
   step 'I click the "Labels" tab' do
diff --git a/features/steps/shared/project_tab.rb b/features/steps/shared/project_tab.rb
index 4fc2ece79ff..fa7d24ce611 100644
--- a/features/steps/shared/project_tab.rb
+++ b/features/steps/shared/project_tab.rb
@@ -41,7 +41,7 @@ module SharedProjectTab
   end
 
   step 'the active main tab should be Settings' do
-    page.within '.nav-sidebar' do
+    page.within '.nav-secondary' do
       expect(page).to have_content('Go to project')
     end
   end
-- 
cgit v1.2.1


From 31b27adeb864ae5f057061b1c208005be181dac4 Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Sat, 2 Apr 2016 11:26:46 +0200
Subject: Fix milestones tab active state and tests

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
---
 app/views/layouts/nav/_dashboard.html.haml | 2 +-
 features/steps/group/milestones.rb         | 4 ++--
 features/steps/project/active_tab.rb       | 2 +-
 features/steps/project/fork.rb             | 2 +-
 features/steps/project/project.rb          | 4 +++-
 5 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/app/views/layouts/nav/_dashboard.html.haml b/app/views/layouts/nav/_dashboard.html.haml
index dc2917df0b9..d1a180e4299 100644
--- a/app/views/layouts/nav/_dashboard.html.haml
+++ b/app/views/layouts/nav/_dashboard.html.haml
@@ -20,7 +20,7 @@
       = icon('group fw')
       %span
         Groups
-  = nav_link(controller: :milestones) do
+  = nav_link(path: 'dashboard#milestones') do
     = link_to dashboard_milestones_path, title: 'Milestones' do
       = icon('clock-o fw')
       %span
diff --git a/features/steps/group/milestones.rb b/features/steps/group/milestones.rb
index f047669ba3d..b6ce5bc9cec 100644
--- a/features/steps/group/milestones.rb
+++ b/features/steps/group/milestones.rb
@@ -5,8 +5,8 @@ class Spinach::Features::GroupMilestones < Spinach::FeatureSteps
   include SharedUser
 
   step 'I click on group milestones' do
-    within '.nav-secondary' do
-      click_link 'Milestones'
+    page.within '.nav-secondary' do
+      click_link("Milestones")
     end
   end
 
diff --git a/features/steps/project/active_tab.rb b/features/steps/project/active_tab.rb
index b08eb45a452..4584fc4d754 100644
--- a/features/steps/project/active_tab.rb
+++ b/features/steps/project/active_tab.rb
@@ -82,7 +82,7 @@ class Spinach::Features::ProjectActiveTab < Spinach::FeatureSteps
   # Sub Tabs: Issues
 
   step 'I click the "Milestones" tab' do
-    within '.nav-secondary' do
+    page.within '.nav-secondary' do
       click_link('Milestones')
     end
   end
diff --git a/features/steps/project/fork.rb b/features/steps/project/fork.rb
index 527f7853da9..d9b16afa9b8 100644
--- a/features/steps/project/fork.rb
+++ b/features/steps/project/fork.rb
@@ -36,7 +36,7 @@ class Spinach::Features::ProjectFork < Spinach::FeatureSteps
   end
 
   step 'I goto the Merge Requests page' do
-    page.within '.page-sidebar-expanded' do
+    page.within '.nav-secondary' do
       click_link "Merge Requests"
     end
   end
diff --git a/features/steps/project/project.rb b/features/steps/project/project.rb
index d24f3cc3065..8f1d4a223a9 100644
--- a/features/steps/project/project.rb
+++ b/features/steps/project/project.rb
@@ -114,7 +114,9 @@ class Spinach::Features::Project < Spinach::FeatureSteps
   end
 
   step 'I should not see "Snippets" button' do
-    expect(page).not_to have_link 'Snippets'
+    page.within '.nav-secondary' do
+      expect(page).not_to have_link 'Snippets'
+    end
   end
 
   step 'project "Shop" belongs to group' do
-- 
cgit v1.2.1