From 8ff491c3de1e2e2accd060cd4e535b5d8d69fada Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Fri, 22 Apr 2016 17:49:37 +0200
Subject: [PATCH 1/5] Concept of group horizontal navigation

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
---
 app/assets/stylesheets/framework/blocks.scss  |  40 ++++++
 app/views/groups/activity.html.haml           |   1 -
 app/views/groups/edit.html.haml               |   2 -
 .../groups/group_members/index.html.haml      |   1 -
 app/views/groups/issues.html.haml             |   1 -
 app/views/groups/merge_requests.html.haml     |   1 -
 app/views/groups/milestones/index.html.haml   |   1 -
 app/views/groups/projects.html.haml           |   1 -
 app/views/groups/show.html.haml               |  23 ----
 app/views/layouts/_page.html.haml             |   3 +-
 app/views/layouts/group.html.haml             |   3 +-
 app/views/layouts/group_settings.html.haml    |   4 +-
 app/views/layouts/nav/_dashboard.html.haml    |   4 +-
 app/views/layouts/nav/_group.html.haml        | 116 +++++++++++-------
 .../layouts/nav/_group_settings.html.haml     |  20 ---
 app/views/layouts/nav/_profile.html.haml      |  97 +++++++--------
 16 files changed, 165 insertions(+), 153 deletions(-)
 delete mode 100644 app/views/layouts/nav/_group_settings.html.haml

diff --git a/app/assets/stylesheets/framework/blocks.scss b/app/assets/stylesheets/framework/blocks.scss
index 62b2af0dbf7e..41bc009bb3b9 100644
--- a/app/assets/stylesheets/framework/blocks.scss
+++ b/app/assets/stylesheets/framework/blocks.scss
@@ -179,3 +179,43 @@
 .content-block-small {
   padding: 10px 0;
 }
+
+.layout-nav .cover-block {
+  padding-top: 20px;
+  text-align: left;
+  border-bottom: 1px solid $border-color;
+
+  .title {
+    color: $gl-header-color;
+    margin: 0;
+    font-size: 23px;
+    font-weight: normal;
+    margin: 16px 0 5px;
+    line-height: 1.1;
+
+    .visibility-icon {
+      margin-left: 5px;
+      font-size: 18px;
+      color: $gl-text-color;
+    }
+  }
+
+  .container-fluid {
+    background: inherit;
+  }
+
+  .controls {
+    float: right;
+    position: relative;
+    top: 20px;
+
+    .dropdown {
+      margin-left: 7px;
+    }
+  }
+
+  .nav-links {
+    margin-top: 20px;
+    border-bottom: none;
+  }
+}
diff --git a/app/views/groups/activity.html.haml b/app/views/groups/activity.html.haml
index f73e1d9e8652..aaad265b3ee3 100644
--- a/app/views/groups/activity.html.haml
+++ b/app/views/groups/activity.html.haml
@@ -3,7 +3,6 @@
     = auto_discovery_link_tag(:atom, group_url(@group, format: :atom, private_token: current_user.private_token), title: "#{@group.name} activity")
 
 - page_title    "Activity"
-- header_title  group_title(@group, "Activity", activity_group_path(@group))
 
 %section.activities
   = render 'activities'
diff --git a/app/views/groups/edit.html.haml b/app/views/groups/edit.html.haml
index a698cbbe9dbd..92cd4c553d0b 100644
--- a/app/views/groups/edit.html.haml
+++ b/app/views/groups/edit.html.haml
@@ -1,5 +1,3 @@
-- header_title group_title(@group, "Settings", edit_group_path(@group))
-
 .panel.panel-default.prepend-top-default
   .panel-heading
     Group settings
diff --git a/app/views/groups/group_members/index.html.haml b/app/views/groups/group_members/index.html.haml
index 6b7fd5746d6f..0eb6bbd44201 100644
--- a/app/views/groups/group_members/index.html.haml
+++ b/app/views/groups/group_members/index.html.haml
@@ -1,5 +1,4 @@
 - page_title "Members"
-- header_title group_title(@group, "Members", group_group_members_path(@group))
 
 .group-members-page.prepend-top-default
   - if current_user && current_user.can?(:admin_group_member, @group)
diff --git a/app/views/groups/issues.html.haml b/app/views/groups/issues.html.haml
index aea35c50862c..76160232e06c 100644
--- a/app/views/groups/issues.html.haml
+++ b/app/views/groups/issues.html.haml
@@ -1,5 +1,4 @@
 - page_title "Issues"
-- header_title group_title(@group, "Issues", issues_group_path(@group))
 = content_for :meta_tags do
   - if current_user
     = auto_discovery_link_tag(:atom, issues_group_url(@group, format: :atom, private_token: current_user.private_token), title: "#{@group.name} issues")
diff --git a/app/views/groups/merge_requests.html.haml b/app/views/groups/merge_requests.html.haml
index e1c9dd931ee6..87090352e269 100644
--- a/app/views/groups/merge_requests.html.haml
+++ b/app/views/groups/merge_requests.html.haml
@@ -1,5 +1,4 @@
 - page_title "Merge Requests"
-- header_title group_title(@group, "Merge Requests", merge_requests_group_path(@group))
 
 .top-area
   = render 'shared/issuable/nav', type: :merge_requests
diff --git a/app/views/groups/milestones/index.html.haml b/app/views/groups/milestones/index.html.haml
index ab307708b754..8bca00eb710f 100644
--- a/app/views/groups/milestones/index.html.haml
+++ b/app/views/groups/milestones/index.html.haml
@@ -1,5 +1,4 @@
 - page_title "Milestones"
-- header_title group_title(@group, "Milestones", group_milestones_path(@group))
 
 .top-area
   = render 'shared/milestones_filter'
diff --git a/app/views/groups/projects.html.haml b/app/views/groups/projects.html.haml
index dd75766121ef..c2f2d9912f78 100644
--- a/app/views/groups/projects.html.haml
+++ b/app/views/groups/projects.html.haml
@@ -1,5 +1,4 @@
 - page_title "Projects"
-- header_title group_title(@group, "Projects", projects_group_path(@group))
 
 .panel.panel-default.prepend-top-default
   .panel-heading
diff --git a/app/views/groups/show.html.haml b/app/views/groups/show.html.haml
index 3d16ecb097a5..d50af5eb8a92 100644
--- a/app/views/groups/show.html.haml
+++ b/app/views/groups/show.html.haml
@@ -4,29 +4,6 @@
   - if current_user
     = auto_discovery_link_tag(:atom, group_url(@group, format: :atom, private_token: current_user.private_token), title: "#{@group.name} activity")
 
-.cover-block
-  .cover-controls
-    - if @group && can?(current_user, :admin_group, @group)
-      = link_to icon('pencil'), edit_group_path(@group), class: 'btn'
-    - if current_user
-      = link_to icon('rss'), group_path(@group, { format: :atom, private_token: current_user.private_token }), title: "Feed", class: 'btn rss-btn'
-
-  .avatar-holder
-    = link_to group_icon(@group), target: '_blank' do
-      = image_tag group_icon(@group), class: "avatar group-avatar s90"
-  .cover-title
-    %h1
-      = @group.name
-      %span.visibility-icon.has-tooltip{ data: { container: 'body' }, title: visibility_icon_description(@group) }
-        = visibility_level_icon(@group.visibility_level, fw: false)
-
-  .cover-desc.username
-    @#{@group.path}
-
-  - if @group.description.present?
-    .cover-desc.description
-      = markdown(@group.description, pipeline: :description)
-
 %div{ class: container_class }
   .top-area
     %ul.nav-links
diff --git a/app/views/layouts/_page.html.haml b/app/views/layouts/_page.html.haml
index ca9c2a0bf2eb..d4e5d5e4bfdf 100644
--- a/app/views/layouts/_page.html.haml
+++ b/app/views/layouts/_page.html.haml
@@ -27,8 +27,7 @@
     = yield :flash_message
     - if defined?(nav) && nav
       .layout-nav
-        %div{ class: container_class }
-          = render "layouts/nav/#{nav}"
+        = render "layouts/nav/#{nav}"
     %div{ class: (container_class unless @no_container) }
       .content
         .clearfix
diff --git a/app/views/layouts/group.html.haml b/app/views/layouts/group.html.haml
index 2e483b7148d0..7bee7e172e65 100644
--- a/app/views/layouts/group.html.haml
+++ b/app/views/layouts/group.html.haml
@@ -1,6 +1,7 @@
 - page_title       @group.name
 - page_description @group.description  unless page_description
 - header_title     group_title(@group) unless header_title
-- sidebar          "group"             unless sidebar
+- sidebar          "dashboard"         unless sidebar
+- nav              "group"
 
 = render template: "layouts/application"
diff --git a/app/views/layouts/group_settings.html.haml b/app/views/layouts/group_settings.html.haml
index a1a1fc2f8584..1ff53ce2a9d4 100644
--- a/app/views/layouts/group_settings.html.haml
+++ b/app/views/layouts/group_settings.html.haml
@@ -1,5 +1,5 @@
 - page_title    "Settings"
-- header_title group_title(@group, "Settings", edit_group_path(@group))
-- sidebar       "group_settings"
+- sidebar       "dashboard" unless sidebar
+- nav           "group"
 
 = render template: "layouts/group"
diff --git a/app/views/layouts/nav/_dashboard.html.haml b/app/views/layouts/nav/_dashboard.html.haml
index ca49c313ff7f..fad4224e9453 100644
--- a/app/views/layouts/nav/_dashboard.html.haml
+++ b/app/views/layouts/nav/_dashboard.html.haml
@@ -15,12 +15,12 @@
       = icon('dashboard fw')
       %span
         Activity
-  = nav_link(controller: :groups) do
+  = nav_link(controller: [:groups, 'groups/milestones', 'groups/group_members']) do
     = link_to dashboard_groups_path, title: 'Groups' do
       = icon('group fw')
       %span
         Groups
-  = nav_link(controller: :milestones) do
+  = nav_link(controller: 'dashboard/milestones') do
     = link_to dashboard_milestones_path, title: 'Milestones' do
       = icon('clock-o fw')
       %span
diff --git a/app/views/layouts/nav/_group.html.haml b/app/views/layouts/nav/_group.html.haml
index 55940741dc07..e30bf280dbaf 100644
--- a/app/views/layouts/nav/_group.html.haml
+++ b/app/views/layouts/nav/_group.html.haml
@@ -1,49 +1,71 @@
-%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
+.cover-block
+  %div{ class: container_class }
+    %div
+      = link_to group_icon(@group), target: '_blank' do
+        = image_tag group_icon(@group), class: "avatar group-avatar s60"
 
-  %li.separate-item
+      %h1.title
+        @#{@group.path}
+        %span.visibility-icon.has-tooltip{ data: { container: 'body' }, title: visibility_icon_description(@group) }
+          = visibility_level_icon(@group.visibility_level, fw: false)
 
-  = nav_link(path: 'groups#show', html_options: {class: 'home'}) do
-    = link_to group_path(@group), title: 'Home' do
-      = icon('group fw')
-      %span
-        Group
-  = nav_link(path: 'groups#activity') do
-    = link_to activity_group_path(@group), title: 'Activity' do
-      = icon('dashboard fw')
-      %span
-        Activity
-  = nav_link(controller: [:group, :milestones]) do
-    = link_to group_milestones_path(@group), title: 'Milestones' do
-      = icon('clock-o fw')
-      %span
-        Milestones
-  = nav_link(path: 'groups#issues') do
-    = link_to issues_group_path(@group), title: 'Issues' do
-      = icon('exclamation-circle fw')
-      %span
-        Issues
-        - issues = IssuesFinder.new(current_user, group_id: @group.id, state: 'opened').execute
-        %span.count= number_with_delimiter(issues.count)
-  = nav_link(path: 'groups#merge_requests') do
-    = link_to merge_requests_group_path(@group), title: 'Merge Requests' do
-      = icon('tasks fw')
-      %span
-        Merge Requests
-        - merge_requests = MergeRequestsFinder.new(current_user, group_id: @group.id, state: 'opened').execute
-        %span.count= number_with_delimiter(merge_requests.count)
-  = nav_link(controller: [:group_members]) do
-    = link_to group_group_members_path(@group), title: 'Members' do
-      = icon('users fw')
-      %span
-        Members
-  - if can?(current_user, :admin_group, @group)
-    = nav_link(html_options: { class: "separate-item" }) do
-      = link_to edit_group_path(@group), title: 'Settings' do
-        = icon ('cogs fw')
-        %span
-          Settings
+      - if @group.description.present?
+        .description
+          = markdown(@group.description, pipeline: :description)
+
+    - if current_user
+      .controls
+        %span.dropdown.group-settings-dropdown
+          %a.dropdown-new.btn.btn-gray#group-settings-button{href: '#', 'data-toggle' => 'dropdown'}
+            = icon('cog')
+            = icon('angle-down')
+          %ul.dropdown-menu.dropdown-menu-align-right
+            = nav_link(path: 'groups#projects') do
+              = link_to projects_group_path(@group), title: 'Projects' do
+                Projects
+            %li.divider
+            - if @group && can?(current_user, :admin_group, @group)
+              %li
+                = link_to edit_group_path(@group) do
+                  Edit Group
+            - if access = @group.users.find(current_user)
+              %li
+                = link_to leave_group_group_members_path(@group),
+                  data: { confirm: leave_group_message(@group.name) }, method: :delete, title: 'Leave group' do
+                  Leave Group
+
+    %ul.nav-links
+      = nav_link(path: 'groups#show', html_options: {class: 'home'}) do
+        = link_to group_path(@group), title: 'Home' do
+          = icon('group fw')
+          %span
+            Group
+      = nav_link(path: 'groups#activity') do
+        = link_to activity_group_path(@group), title: 'Activity' do
+          = icon('dashboard fw')
+          %span
+            Activity
+      = nav_link(controller: [:group, :milestones]) do
+        = link_to group_milestones_path(@group), title: 'Milestones' do
+          = icon('clock-o fw')
+          %span
+            Milestones
+      = nav_link(path: 'groups#issues') do
+        = link_to issues_group_path(@group), title: 'Issues' do
+          = icon('exclamation-circle fw')
+          %span
+            Issues
+            - issues = IssuesFinder.new(current_user, group_id: @group.id, state: 'opened').execute
+            %span.count= number_with_delimiter(issues.count)
+      = nav_link(path: 'groups#merge_requests') do
+        = link_to merge_requests_group_path(@group), title: 'Merge Requests' do
+          = icon('tasks fw')
+          %span
+            Merge Requests
+            - merge_requests = MergeRequestsFinder.new(current_user, group_id: @group.id, state: 'opened').execute
+            %span.count= number_with_delimiter(merge_requests.count)
+      = nav_link(controller: [:group_members]) do
+        = link_to group_group_members_path(@group), title: 'Members' do
+          = icon('users fw')
+          %span
+            Members
diff --git a/app/views/layouts/nav/_group_settings.html.haml b/app/views/layouts/nav/_group_settings.html.haml
deleted file mode 100644
index 56a92fe9103b..000000000000
--- a/app/views/layouts/nav/_group_settings.html.haml
+++ /dev/null
@@ -1,20 +0,0 @@
-%ul.nav.nav-sidebar
-  = nav_link do
-    = link_to group_path(@group), title: 'Go to group', class: 'back-link' do
-      = icon('caret-square-o-left fw')
-      %span
-        Go to group
-
-  %li.separate-item
-
-  %ul.sidebar-subnav
-    = nav_link(path: 'groups#edit') do
-      = link_to edit_group_path(@group), title: 'Group Settings' do
-        = icon ('pencil-square-o fw')
-        %span
-          Group Settings
-    = nav_link(path: 'groups#projects') do
-      = link_to projects_group_path(@group), title: 'Projects' do
-        = icon('folder fw')
-        %span
-          Projects
diff --git a/app/views/layouts/nav/_profile.html.haml b/app/views/layouts/nav/_profile.html.haml
index d730840d63a9..4290655e9aa3 100644
--- a/app/views/layouts/nav/_profile.html.haml
+++ b/app/views/layouts/nav/_profile.html.haml
@@ -1,49 +1,50 @@
-%ul.nav-links
-  = nav_link(path: 'profiles#show', html_options: {class: 'home'}) do
-    = link_to profile_path, title: 'Profile Settings' do
-      = icon('user fw')
-      %span
-        Profile
-  = nav_link(controller: [:accounts, :two_factor_auths]) do
-    = link_to profile_account_path, title: 'Account' do
-      = icon('gear fw')
-      %span
-        Account
-  = nav_link(controller: 'oauth/applications') do
-    = link_to applications_profile_path, title: 'Applications' do
-      = icon('cloud fw')
-      %span
-        Applications
-  = nav_link(controller: :emails) do
-    = link_to profile_emails_path, title: 'Emails' do
-      = icon('envelope-o fw')
-      %span
-        Emails
-  - unless current_user.ldap_user?
-    = nav_link(controller: :passwords) do
-      = link_to edit_profile_password_path, title: 'Password' do
-        = icon('lock fw')
-        %span
-          Password
-  = nav_link(controller: :notifications) do
-    = link_to profile_notifications_path, title: 'Notifications' do
-      = icon('inbox fw')
-      %span
-        Notifications
+%div{ class: container_class }
+  %ul.nav-links
+    = nav_link(path: 'profiles#show', html_options: {class: 'home'}) do
+      = link_to profile_path, title: 'Profile Settings' do
+        = icon('user fw')
+        %span
+          Profile
+    = nav_link(controller: [:accounts, :two_factor_auths]) do
+      = link_to profile_account_path, title: 'Account' do
+        = icon('gear fw')
+        %span
+          Account
+    = nav_link(controller: 'oauth/applications') do
+      = link_to applications_profile_path, title: 'Applications' do
+        = icon('cloud fw')
+        %span
+          Applications
+    = nav_link(controller: :emails) do
+      = link_to profile_emails_path, title: 'Emails' do
+        = icon('envelope-o fw')
+        %span
+          Emails
+    - unless current_user.ldap_user?
+      = nav_link(controller: :passwords) do
+        = link_to edit_profile_password_path, title: 'Password' do
+          = icon('lock fw')
+          %span
+            Password
+    = nav_link(controller: :notifications) do
+      = link_to profile_notifications_path, title: 'Notifications' do
+        = icon('inbox fw')
+        %span
+          Notifications
 
-  = nav_link(controller: :keys) do
-    = link_to profile_keys_path, title: 'SSH Keys' do
-      = icon('key fw')
-      %span
-        SSH Keys
-  = nav_link(controller: :preferences) do
-    = link_to profile_preferences_path, title: 'Preferences' do
-      -# TODO (rspeicher): Better icon?
-      = icon('image fw')
-      %span
-        Preferences
-  = nav_link(path: 'profiles#audit_log') do
-    = link_to audit_log_profile_path, title: 'Audit Log' do
-      = icon('history fw')
-      %span
-        Audit Log
+    = nav_link(controller: :keys) do
+      = link_to profile_keys_path, title: 'SSH Keys' do
+        = icon('key fw')
+        %span
+          SSH Keys
+    = nav_link(controller: :preferences) do
+      = link_to profile_preferences_path, title: 'Preferences' do
+        -# TODO (rspeicher): Better icon?
+        = icon('image fw')
+        %span
+          Preferences
+    = nav_link(path: 'profiles#audit_log') do
+      = link_to audit_log_profile_path, title: 'Audit Log' do
+        = icon('history fw')
+        %span
+          Audit Log
-- 
GitLab


From bfc9545b5e9b84c79b5236be84bea124682bda73 Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Mon, 25 Apr 2016 00:28:44 +0200
Subject: [PATCH 2/5] Continue experiment with group navigation

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
---
 app/assets/stylesheets/framework/blocks.scss |  40 ------
 app/assets/stylesheets/framework/nav.scss    |  23 ++++
 app/views/groups/show.html.haml              |  17 +++
 app/views/layouts/nav/_group.html.haml       | 126 +++++++++----------
 4 files changed, 96 insertions(+), 110 deletions(-)

diff --git a/app/assets/stylesheets/framework/blocks.scss b/app/assets/stylesheets/framework/blocks.scss
index 41bc009bb3b9..62b2af0dbf7e 100644
--- a/app/assets/stylesheets/framework/blocks.scss
+++ b/app/assets/stylesheets/framework/blocks.scss
@@ -179,43 +179,3 @@
 .content-block-small {
   padding: 10px 0;
 }
-
-.layout-nav .cover-block {
-  padding-top: 20px;
-  text-align: left;
-  border-bottom: 1px solid $border-color;
-
-  .title {
-    color: $gl-header-color;
-    margin: 0;
-    font-size: 23px;
-    font-weight: normal;
-    margin: 16px 0 5px;
-    line-height: 1.1;
-
-    .visibility-icon {
-      margin-left: 5px;
-      font-size: 18px;
-      color: $gl-text-color;
-    }
-  }
-
-  .container-fluid {
-    background: inherit;
-  }
-
-  .controls {
-    float: right;
-    position: relative;
-    top: 20px;
-
-    .dropdown {
-      margin-left: 7px;
-    }
-  }
-
-  .nav-links {
-    margin-top: 20px;
-    border-bottom: none;
-  }
-}
diff --git a/app/assets/stylesheets/framework/nav.scss b/app/assets/stylesheets/framework/nav.scss
index 192d53b048aa..ee1f9c2dcc24 100644
--- a/app/assets/stylesheets/framework/nav.scss
+++ b/app/assets/stylesheets/framework/nav.scss
@@ -185,3 +185,26 @@
     }
   }
 }
+
+.layout-nav {
+  background: $background-color;
+  border-bottom: 1px solid $border-color;
+
+  .container-fluid {
+    background: inherit !important;
+  }
+
+  .controls {
+    float: right;
+    position: relative;
+    top: 10px;
+
+    .dropdown {
+      margin-left: 7px;
+    }
+  }
+
+  .nav-links {
+    border-bottom: none;
+  }
+}
diff --git a/app/views/groups/show.html.haml b/app/views/groups/show.html.haml
index d50af5eb8a92..c71070e6c9c2 100644
--- a/app/views/groups/show.html.haml
+++ b/app/views/groups/show.html.haml
@@ -4,6 +4,23 @@
   - if current_user
     = auto_discovery_link_tag(:atom, group_url(@group, format: :atom, private_token: current_user.private_token), title: "#{@group.name} activity")
 
+.cover-block
+  .avatar-holder
+    = link_to group_icon(@group), target: '_blank' do
+      = image_tag group_icon(@group), class: "avatar group-avatar s90"
+  .cover-title
+    %h1
+      = @group.name
+      %span.visibility-icon.has-tooltip{ data: { container: 'body' }, title: visibility_icon_description(@group) }
+        = visibility_level_icon(@group.visibility_level, fw: false)
+
+  .cover-desc.username
+    @#{@group.path}
+
+  - if @group.description.present?
+    .cover-desc.description
+      = markdown(@group.description, pipeline: :description)
+
 %div{ class: container_class }
   .top-area
     %ul.nav-links
diff --git a/app/views/layouts/nav/_group.html.haml b/app/views/layouts/nav/_group.html.haml
index e30bf280dbaf..aa9e74b9028e 100644
--- a/app/views/layouts/nav/_group.html.haml
+++ b/app/views/layouts/nav/_group.html.haml
@@ -1,71 +1,57 @@
-.cover-block
-  %div{ class: container_class }
-    %div
-      = link_to group_icon(@group), target: '_blank' do
-        = image_tag group_icon(@group), class: "avatar group-avatar s60"
+%div{ class: container_class }
+  - if current_user
+    .controls
+      %span.dropdown.group-settings-dropdown
+        %a.dropdown-new.btn.btn-gray#group-settings-button{href: '#', 'data-toggle' => 'dropdown'}
+          = icon('cog')
+          = icon('angle-down')
+        %ul.dropdown-menu.dropdown-menu-align-right
+          = nav_link(path: 'groups#projects') do
+            = link_to projects_group_path(@group), title: 'Projects' do
+              Projects
+          %li.divider
+          - if @group && can?(current_user, :admin_group, @group)
+            %li
+              = link_to edit_group_path(@group) do
+                Edit Group
+          - if access = @group.users.find(current_user)
+            %li
+              = link_to leave_group_group_members_path(@group),
+                data: { confirm: leave_group_message(@group.name) }, method: :delete, title: 'Leave group' do
+                Leave Group
 
-      %h1.title
-        @#{@group.path}
-        %span.visibility-icon.has-tooltip{ data: { container: 'body' }, title: visibility_icon_description(@group) }
-          = visibility_level_icon(@group.visibility_level, fw: false)
-
-      - if @group.description.present?
-        .description
-          = markdown(@group.description, pipeline: :description)
-
-    - if current_user
-      .controls
-        %span.dropdown.group-settings-dropdown
-          %a.dropdown-new.btn.btn-gray#group-settings-button{href: '#', 'data-toggle' => 'dropdown'}
-            = icon('cog')
-            = icon('angle-down')
-          %ul.dropdown-menu.dropdown-menu-align-right
-            = nav_link(path: 'groups#projects') do
-              = link_to projects_group_path(@group), title: 'Projects' do
-                Projects
-            %li.divider
-            - if @group && can?(current_user, :admin_group, @group)
-              %li
-                = link_to edit_group_path(@group) do
-                  Edit Group
-            - if access = @group.users.find(current_user)
-              %li
-                = link_to leave_group_group_members_path(@group),
-                  data: { confirm: leave_group_message(@group.name) }, method: :delete, title: 'Leave group' do
-                  Leave Group
-
-    %ul.nav-links
-      = nav_link(path: 'groups#show', html_options: {class: 'home'}) do
-        = link_to group_path(@group), title: 'Home' do
-          = icon('group fw')
-          %span
-            Group
-      = nav_link(path: 'groups#activity') do
-        = link_to activity_group_path(@group), title: 'Activity' do
-          = icon('dashboard fw')
-          %span
-            Activity
-      = nav_link(controller: [:group, :milestones]) do
-        = link_to group_milestones_path(@group), title: 'Milestones' do
-          = icon('clock-o fw')
-          %span
-            Milestones
-      = nav_link(path: 'groups#issues') do
-        = link_to issues_group_path(@group), title: 'Issues' do
-          = icon('exclamation-circle fw')
-          %span
-            Issues
-            - issues = IssuesFinder.new(current_user, group_id: @group.id, state: 'opened').execute
-            %span.count= number_with_delimiter(issues.count)
-      = nav_link(path: 'groups#merge_requests') do
-        = link_to merge_requests_group_path(@group), title: 'Merge Requests' do
-          = icon('tasks fw')
-          %span
-            Merge Requests
-            - merge_requests = MergeRequestsFinder.new(current_user, group_id: @group.id, state: 'opened').execute
-            %span.count= number_with_delimiter(merge_requests.count)
-      = nav_link(controller: [:group_members]) do
-        = link_to group_group_members_path(@group), title: 'Members' do
-          = icon('users fw')
-          %span
-            Members
+  %ul.nav-links
+    = nav_link(path: 'groups#show', html_options: {class: 'home'}) do
+      = link_to group_path(@group), title: 'Home' do
+        = icon('group fw')
+        %span
+          Group
+    = nav_link(path: 'groups#activity') do
+      = link_to activity_group_path(@group), title: 'Activity' do
+        = icon('dashboard fw')
+        %span
+          Activity
+    = nav_link(controller: [:group, :milestones]) do
+      = link_to group_milestones_path(@group), title: 'Milestones' do
+        = icon('clock-o fw')
+        %span
+          Milestones
+    = nav_link(path: 'groups#issues') do
+      = link_to issues_group_path(@group), title: 'Issues' do
+        = icon('exclamation-circle fw')
+        %span
+          Issues
+          - issues = IssuesFinder.new(current_user, group_id: @group.id, state: 'opened').execute
+          %span.count= number_with_delimiter(issues.count)
+    = nav_link(path: 'groups#merge_requests') do
+      = link_to merge_requests_group_path(@group), title: 'Merge Requests' do
+        = icon('tasks fw')
+        %span
+          Merge Requests
+          - merge_requests = MergeRequestsFinder.new(current_user, group_id: @group.id, state: 'opened').execute
+          %span.count= number_with_delimiter(merge_requests.count)
+    = nav_link(controller: [:group_members]) do
+      = link_to group_group_members_path(@group), title: 'Members' do
+        = icon('users fw')
+        %span
+          Members
-- 
GitLab


From e170cd9af337eec046c6cf3a372996e3955b9cdf Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Mon, 25 Apr 2016 13:08:33 +0200
Subject: [PATCH 3/5] Make project navigation horizontal with static left
 sideabr

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
---
 app/helpers/tab_helper.rb                    |   4 +-
 app/views/layouts/nav/_dashboard.html.haml   |   2 +-
 app/views/layouts/nav/_group.html.haml       |   4 +-
 app/views/layouts/nav/_project.html.haml     | 272 +++++++++++--------
 app/views/layouts/project.html.haml          |   3 +-
 app/views/layouts/project_settings.html.haml |   3 +-
 app/views/projects/_home_panel.html.haml     |  17 --
 7 files changed, 170 insertions(+), 135 deletions(-)

diff --git a/app/helpers/tab_helper.rb b/app/helpers/tab_helper.rb
index 96a836710096..9f639d3461d3 100644
--- a/app/helpers/tab_helper.rb
+++ b/app/helpers/tab_helper.rb
@@ -95,7 +95,9 @@ def current_path?(path)
   end
 
   def project_tab_class
-    return "active" if current_page?(controller: "/projects", action: :edit, id: @project)
+    if controller.controller_path =~ /\Aprojects/
+      return 'active'
+    end
 
     if ['services', 'hooks', 'deploy_keys', 'protected_branches'].include? controller.controller_name
       "active"
diff --git a/app/views/layouts/nav/_dashboard.html.haml b/app/views/layouts/nav/_dashboard.html.haml
index fad4224e9453..c82c2f1bfaf3 100644
--- a/app/views/layouts/nav/_dashboard.html.haml
+++ b/app/views/layouts/nav/_dashboard.html.haml
@@ -1,5 +1,5 @@
 %ul.nav.nav-sidebar
-  = nav_link(path: ['root#index', 'projects#trending', 'projects#starred', 'dashboard/projects#index'], html_options: {class: 'home'}) do
+  = nav_link(path: ['root#index', 'projects#trending', 'projects#starred', 'dashboard/projects#index'], html_options: {class: "#{project_tab_class} home"}) do
     = link_to dashboard_projects_path, title: 'Projects' do
       = icon('bookmark fw')
       %span
diff --git a/app/views/layouts/nav/_group.html.haml b/app/views/layouts/nav/_group.html.haml
index aa9e74b9028e..e41fb90ca2e8 100644
--- a/app/views/layouts/nav/_group.html.haml
+++ b/app/views/layouts/nav/_group.html.haml
@@ -42,14 +42,14 @@
         %span
           Issues
           - issues = IssuesFinder.new(current_user, group_id: @group.id, state: 'opened').execute
-          %span.count= number_with_delimiter(issues.count)
+          %span.badge.count= number_with_delimiter(issues.count)
     = nav_link(path: 'groups#merge_requests') do
       = link_to merge_requests_group_path(@group), title: 'Merge Requests' do
         = icon('tasks fw')
         %span
           Merge Requests
           - merge_requests = MergeRequestsFinder.new(current_user, group_id: @group.id, state: 'opened').execute
-          %span.count= number_with_delimiter(merge_requests.count)
+          %span.badge.count= number_with_delimiter(merge_requests.count)
     = nav_link(controller: [:group_members]) do
       = link_to group_group_members_path(@group), title: 'Members' do
         = icon('users fw')
diff --git a/app/views/layouts/nav/_project.html.haml b/app/views/layouts/nav/_project.html.haml
index a15b7758c4bb..680c3415bab3 100644
--- a/app/views/layouts/nav/_project.html.haml
+++ b/app/views/layouts/nav/_project.html.haml
@@ -1,126 +1,174 @@
-%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')
+%div{ class: container_class }
+  - if current_user
+    .controls
+      %span.dropdown.project-settings-dropdown
+        %a.dropdown-new.btn.btn-gray#project-settings-button{href: '#', 'data-toggle' => 'dropdown'}
+          = icon('cog')
+          = icon('angle-down')
+        %ul.dropdown-menu.dropdown-menu-align-right
+          - if @project.allowed_to_share_with_group?
+            = nav_link(controller: :group_links) do
+              = link_to namespace_project_group_links_path(@project.namespace, @project), title: "Groups" do
+                %span
+                  Groups
+          = nav_link(controller: :deploy_keys) do
+            = link_to namespace_project_deploy_keys_path(@project.namespace, @project), title: 'Deploy Keys' do
+              %span
+                Deploy Keys
+          = nav_link(controller: :hooks) do
+            = link_to namespace_project_hooks_path(@project.namespace, @project), title: 'Webhooks' do
+              %span
+                Webhooks
+          = nav_link(controller: :services) do
+            = link_to namespace_project_services_path(@project.namespace, @project), title: 'Services' do
+              %span
+                Services
+          = nav_link(controller: :protected_branches) do
+            = link_to namespace_project_protected_branches_path(@project.namespace, @project), title: 'Protected Branches' do
+              %span
+                Protected Branches
+
+          - if @project.builds_enabled?
+            = nav_link(controller: :runners) do
+              = link_to namespace_project_runners_path(@project.namespace, @project), title: 'Runners' do
+                %span
+                  Runners
+            = nav_link(controller: :variables) do
+              = link_to namespace_project_variables_path(@project.namespace, @project), title: 'Variables' do
+                %span
+                  Variables
+            = nav_link(controller: :triggers) do
+              = link_to namespace_project_triggers_path(@project.namespace, @project), title: 'Triggers' do
+                %span
+                  Triggers
+            = nav_link(controller: :badges) do
+              = link_to namespace_project_badges_path(@project.namespace, @project), title: 'Badges' do
+                %span
+                  Badges
+
+          - access = user_max_access_in_project(current_user.id, @project)
+          - can_edit = can?(current_user, :admin_project, @project)
+          - if access || can_edit
+            %li.divider
+            - if can_edit
+              %li
+                = link_to edit_project_path(@project) do
+                  Edit Project
+            - if access
+              %li
+                = link_to leave_namespace_project_project_members_path(@project.namespace, @project),
+                  data: { confirm: leave_project_message(@project) }, method: :delete, title: 'Leave project' do
+                  Leave Project
+
+
+  %ul.nav-links
+    = 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
-          Go to dashboard
-
-  %li.separate-item
-
-  = 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')
+          Project
+    = nav_link(path: 'projects#activity') do
+      = link_to activity_project_path(@project), title: 'Activity', class: 'shortcuts-project-activity' do
+        = icon('dashboard fw')
         %span
-          Files
+          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.badge.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? :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.badge.count.issue_counter= number_with_delimiter(@project.issues.visible_to_user(current_user).opened.count)
 
-  - if project_nav_tab? :team
-    = 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.badge.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? :team
+      = 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
diff --git a/app/views/layouts/project.html.haml b/app/views/layouts/project.html.haml
index 6dfe7fbdae81..b20eb1db24bd 100644
--- a/app/views/layouts/project.html.haml
+++ b/app/views/layouts/project.html.haml
@@ -1,7 +1,8 @@
 - page_title       @project.name_with_namespace
 - page_description @project.description    unless page_description
 - header_title     project_title(@project) unless header_title
-- sidebar          "project"               unless sidebar
+- sidebar          "dashboard"             unless sidebar
+- nav              "project"
 
 - content_for :scripts_body_top do
   - project = @target_project || @project
diff --git a/app/views/layouts/project_settings.html.haml b/app/views/layouts/project_settings.html.haml
index 59ce38f67bbd..c270f3f1051a 100644
--- a/app/views/layouts/project_settings.html.haml
+++ b/app/views/layouts/project_settings.html.haml
@@ -1,5 +1,6 @@
 - page_title  "Settings"
 - header_title project_title(@project, "Settings", edit_project_path(@project))
-- sidebar     "project_settings"
+- sidebar          "dashboard"             unless sidebar
+- nav              "project"
 
 = render template: "layouts/project"
diff --git a/app/views/projects/_home_panel.html.haml b/app/views/projects/_home_panel.html.haml
index 9b5de17dd3bb..aca34e0b6dd5 100644
--- a/app/views/projects/_home_panel.html.haml
+++ b/app/views/projects/_home_panel.html.haml
@@ -22,23 +22,6 @@
     - if current_user
       = link_to namespace_project_path(@project.namespace, @project, format: :atom, private_token: current_user.private_token), class: 'btn btn-gray' do
         = icon('rss')
-      - access = user_max_access_in_project(current_user.id, @project)
-      - can_edit = can?(current_user, :admin_project, @project)
-      - if access || can_edit
-        %span.dropdown.project-settings-dropdown
-          %a.dropdown-new.btn.btn-gray#project-settings-button{href: '#', 'data-toggle' => 'dropdown'}
-            = icon('cog')
-            = icon('angle-down')
-          %ul.dropdown-menu.dropdown-menu-right
-            - if can_edit
-              %li
-                = link_to edit_project_path(@project) do
-                  Edit Project
-            - if access
-              %li
-                = link_to leave_namespace_project_project_members_path(@project.namespace, @project),
-                  data: { confirm: leave_project_message(@project) }, method: :delete, title: 'Leave project' do
-                  Leave Project
 
   .project-repo-buttons
     .split-one.count-buttons
-- 
GitLab


From fd6e1288246c69f984c57d60adf28636e48af66a Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Thu, 28 Apr 2016 10:48:01 +0200
Subject: [PATCH 4/5] Keep navigation in fluid container

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
---
 app/assets/stylesheets/framework/header.scss | 6 +++---
 app/views/layouts/nav/_group.html.haml       | 2 +-
 app/views/layouts/nav/_profile.html.haml     | 2 +-
 app/views/layouts/nav/_project.html.haml     | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/assets/stylesheets/framework/header.scss b/app/assets/stylesheets/framework/header.scss
index c303380764b0..2a3f6d5a432e 100644
--- a/app/assets/stylesheets/framework/header.scss
+++ b/app/assets/stylesheets/framework/header.scss
@@ -26,9 +26,9 @@ header {
     z-index: 100;
     margin-bottom: 0;
     min-height: $header-height;
-    background-color: #fff;
+    background-color: $gray-light;
     border: none;
-    border-bottom: 1px solid #eee;
+    border-bottom: 1px solid $gray-light;
 
     .container-fluid {
       width: 100% !important;
@@ -47,7 +47,7 @@ header {
         text-align: center;
 
         &:hover, &:focus, &:active {
-          background-color: #fff;
+          background-color: $gray-light;
         }
       }
 
diff --git a/app/views/layouts/nav/_group.html.haml b/app/views/layouts/nav/_group.html.haml
index e41fb90ca2e8..06733ba628af 100644
--- a/app/views/layouts/nav/_group.html.haml
+++ b/app/views/layouts/nav/_group.html.haml
@@ -1,4 +1,4 @@
-%div{ class: container_class }
+.container-fluid
   - if current_user
     .controls
       %span.dropdown.group-settings-dropdown
diff --git a/app/views/layouts/nav/_profile.html.haml b/app/views/layouts/nav/_profile.html.haml
index 4290655e9aa3..b9f7f3b1cdc3 100644
--- a/app/views/layouts/nav/_profile.html.haml
+++ b/app/views/layouts/nav/_profile.html.haml
@@ -1,4 +1,4 @@
-%div{ class: container_class }
+.container-fluid
   %ul.nav-links
     = nav_link(path: 'profiles#show', html_options: {class: 'home'}) do
       = link_to profile_path, title: 'Profile Settings' do
diff --git a/app/views/layouts/nav/_project.html.haml b/app/views/layouts/nav/_project.html.haml
index 680c3415bab3..8a9834ca5d80 100644
--- a/app/views/layouts/nav/_project.html.haml
+++ b/app/views/layouts/nav/_project.html.haml
@@ -1,4 +1,4 @@
-%div{ class: container_class }
+.container-fluid
   - if current_user
     .controls
       %span.dropdown.project-settings-dropdown
-- 
GitLab


From 4b7629ca5a8a15a367fed9a137626044b08d577b Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Thu, 28 Apr 2016 10:58:05 +0200
Subject: [PATCH 5/5] Show bottom border for one and 2 row header

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
---
 app/assets/stylesheets/framework/header.scss | 2 +-
 app/assets/stylesheets/framework/nav.scss    | 5 ++++-
 app/views/layouts/_page.html.haml            | 6 +++---
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/app/assets/stylesheets/framework/header.scss b/app/assets/stylesheets/framework/header.scss
index 2a3f6d5a432e..4e66f762c551 100644
--- a/app/assets/stylesheets/framework/header.scss
+++ b/app/assets/stylesheets/framework/header.scss
@@ -28,7 +28,7 @@ header {
     min-height: $header-height;
     background-color: $gray-light;
     border: none;
-    border-bottom: 1px solid $gray-light;
+    border-bottom: 1px solid $border-color;
 
     .container-fluid {
       width: 100% !important;
diff --git a/app/assets/stylesheets/framework/nav.scss b/app/assets/stylesheets/framework/nav.scss
index ee1f9c2dcc24..649ac7286622 100644
--- a/app/assets/stylesheets/framework/nav.scss
+++ b/app/assets/stylesheets/framework/nav.scss
@@ -187,7 +187,10 @@
 }
 
 .layout-nav {
-  background: $background-color;
+  position: relative;
+  z-index: 101;
+  margin-top: -1px;
+  background: $gray-light;
   border-bottom: 1px solid $border-color;
 
   .container-fluid {
diff --git a/app/views/layouts/_page.html.haml b/app/views/layouts/_page.html.haml
index d4e5d5e4bfdf..6f4dc1737cdd 100644
--- a/app/views/layouts/_page.html.haml
+++ b/app/views/layouts/_page.html.haml
@@ -22,12 +22,12 @@
         = image_tag avatar_icon(current_user, 60), alt: 'Profile', class: 'avatar avatar s36'
         .username
           = current_user.username
+  - if defined?(nav) && nav
+    .layout-nav
+      = render "layouts/nav/#{nav}"
   .content-wrapper
     = render "layouts/flash"
     = yield :flash_message
-    - if defined?(nav) && nav
-      .layout-nav
-        = render "layouts/nav/#{nav}"
     %div{ class: (container_class unless @no_container) }
       .content
         .clearfix
-- 
GitLab