From 003b36b45f38ca3116af5d9179fff4adb26a4eb1 Mon Sep 17 00:00:00 2001
From: Annabel Dunstone <annabel.dunstone@gmail.com>
Date: Wed, 4 May 2016 11:43:47 -0500
Subject: [PATCH] Fixed layout nav, revert back to badge styles, general
 enhancements

---
 app/assets/stylesheets/framework/nav.scss     | 36 +++++++++++++------
 app/assets/stylesheets/framework/sidebar.scss |  8 +++++
 app/views/groups/show.html.haml               |  2 +-
 app/views/layouts/_page.html.haml             |  2 +-
 app/views/layouts/nav/_group.html.haml        |  6 ++--
 5 files changed, 38 insertions(+), 16 deletions(-)

diff --git a/app/assets/stylesheets/framework/nav.scss b/app/assets/stylesheets/framework/nav.scss
index 2ada2b9f2f2..c79de099d38 100644
--- a/app/assets/stylesheets/framework/nav.scss
+++ b/app/assets/stylesheets/framework/nav.scss
@@ -140,6 +140,12 @@
       }
     }
 
+    .project-filter-form {
+      input {
+        background-color: $background-color;
+      }
+    }
+
     @media (max-width: $screen-xs-max) {
       padding-bottom: 0;
 
@@ -187,13 +193,17 @@
 }
 
 .layout-nav {
+  position: fixed;
+  top: 58px;
+  width: 100%;
+  z-index: 1;
   background: $background-color;
   border-bottom: 1px solid $border-color;
+  transition-duration: .3s;
 
   .controls {
     float: right;
-    position: relative;
-    top: 0;
+    padding: 12px 5px 0 0;
 
     .dropdown {
       margin-left: 7px;
@@ -218,15 +228,21 @@
       }
     }
   }
-}
 
-.nav-links {
-  border-bottom: none;
-  white-space: nowrap;
-  overflow-x: auto;
-  overflow-y: hidden;
+  .nav-links {
+    border-bottom: none;
 
-  a {
-    padding-top: 2px;
+    li {
+
+      .badge {
+        color: $gl-icon-color;
+      }
+
+    }
   }
+
+}
+
+.page-with-layout-nav {
+  margin-top: 56px;
 }
diff --git a/app/assets/stylesheets/framework/sidebar.scss b/app/assets/stylesheets/framework/sidebar.scss
index 18189e985c4..32d948e4c53 100644
--- a/app/assets/stylesheets/framework/sidebar.scss
+++ b/app/assets/stylesheets/framework/sidebar.scss
@@ -254,6 +254,10 @@
       }
     }
   }
+
+  .layout-nav {
+    padding-right: $sidebar_collapsed_width;
+  }
 }
 
 .page-sidebar-expanded {
@@ -280,6 +284,10 @@
       }
     }
   }
+
+  .layout-nav {
+    padding-right: $sidebar_width;
+  }
 }
 
 .right-sidebar-collapsed {
diff --git a/app/views/groups/show.html.haml b/app/views/groups/show.html.haml
index 8c23a4ed1a4..089de798bd8 100644
--- a/app/views/groups/show.html.haml
+++ b/app/views/groups/show.html.haml
@@ -5,7 +5,7 @@
     = auto_discovery_link_tag(:atom, group_url(@group, format: :atom, private_token: current_user.private_token), title: "#{@group.name} activity")
 
 .cover-block.groups-cover-block
-  .container-fluid
+  .container-fluid.container-limited
     = link_to group_icon(@group), target: '_blank' do
       = image_tag group_icon(@group), class: "avatar group-avatar s90"
     .group-info
diff --git a/app/views/layouts/_page.html.haml b/app/views/layouts/_page.html.haml
index ad8a2e1e6c7..3c3bc41bf0e 100644
--- a/app/views/layouts/_page.html.haml
+++ b/app/views/layouts/_page.html.haml
@@ -26,7 +26,7 @@
     .layout-nav
       .container-fluid
         = render "layouts/nav/#{nav}"
-  .content-wrapper
+  .content-wrapper{ class: ('page-with-layout-nav' if defined?(nav) && nav) }
     = render "layouts/flash"
     = yield :flash_message
     %div{ class: (container_class unless @no_container) }
diff --git a/app/views/layouts/nav/_group.html.haml b/app/views/layouts/nav/_group.html.haml
index 705682aeb29..0971bccfcd4 100644
--- a/app/views/layouts/nav/_group.html.haml
+++ b/app/views/layouts/nav/_group.html.haml
@@ -44,16 +44,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')