Add container_class to top level navigation27934-add-container-to-top-nav

2 files changed, 4 insertions, 24 deletions

diff --git a/app/assets/stylesheets/framework/header.scss b/app/assets/stylesheets/framework/header.scss
index 78434b99b62..c60034cde9a 100644
--- a/app/assets/stylesheets/framework/header.scss
+++ b/app/assets/stylesheets/framework/header.scss
@@ -23,26 +23,17 @@ header {
   }
 
   &.navbar-gitlab {
-    padding: 0 16px;
-    z-index: 100;
     margin-bottom: 0;
     height: $header-height;
     background-color: $gray-light;
     border: none;
     border-bottom: 1px solid $border-color;
 
-    @media (max-width: $screen-xs-min) {
-      padding: 0 16px;
-    }
-
     &.with-horizontal-nav {
       border-bottom: none;
     }
 
     .container-fluid {
-      width: 100% !important;
-      filter: none;
-      padding: 0;
 
       .nav > li > a {
         color: $gl-text-color-secondary;
@@ -87,8 +78,6 @@ header {
         color: $nav-toggle-gray;
         margin: 6px 0;
         border-radius: 0;
-        position: absolute;
-        right: -10px;
         padding: 6px 10px;
 
         &:hover {
@@ -103,12 +92,9 @@ header {
   }
 
   .global-dropdown {
-    position: absolute;
-    left: -10px;
-
-    .badge {
-      font-size: 11px;
-    }
+    display: inline-block;
+    vertical-align: top;
+    margin-top: 6px;
 
     li {
       &.active a {
@@ -118,7 +104,6 @@ header {
   }
 
   .global-dropdown-toggle {
-    margin: 7px 0;
     font-size: 18px;
     padding: 6px 10px;
     border: none;
@@ -137,11 +122,6 @@ header {
   .header-content {
     position: relative;
     height: $header-height;
-    padding-left: 30px;
-
-    @media (min-width: $screen-sm-min) {
-      padding-right: 0;
-    }
 
     .dropdown-menu {
       margin-top: -5px;
diff --git a/app/views/layouts/header/_default.html.haml b/app/views/layouts/header/_default.html.haml
index 60b9b8bdbc4..808e440ce89 100644
--- a/app/views/layouts/header/_default.html.haml
+++ b/app/views/layouts/header/_default.html.haml
@@ -1,6 +1,6 @@
 %header.navbar.navbar-gitlab{ class: nav_header_class }
   %a.sr-only.gl-accessibility{ href: "#content-body", tabindex: "1" } Skip to content
-  .container-fluid
+  %div{ class: container_class }
     .header-content
       .dropdown.global-dropdown
         %button.global-dropdown-toggle{ type: 'button', 'data-toggle' => 'dropdown' }