From 060921921d920e9f4942885507a7296424ddf08c Mon Sep 17 00:00:00 2001
From: Annabel Dunstone Gray <annabel.dunstone@gmail.com>
Date: Thu, 17 Nov 2016 16:46:48 -0700
Subject: [PATCH] Remove fixed positioning from navbar

---
 app/assets/stylesheets/framework/nav.scss     | 4 ----
 app/assets/stylesheets/framework/sidebar.scss | 2 +-
 app/views/layouts/header/_default.html.haml   | 2 +-
 spec/javascripts/fixtures/header.html.haml    | 2 +-
 4 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/app/assets/stylesheets/framework/nav.scss b/app/assets/stylesheets/framework/nav.scss
index fd081c2d7e1..d62f34ccb85 100644
--- a/app/assets/stylesheets/framework/nav.scss
+++ b/app/assets/stylesheets/framework/nav.scss
@@ -283,10 +283,7 @@
 }
 
 .layout-nav {
-  position: fixed;
-  top: $header-height;
   width: 100%;
-  z-index: 11;
   background: $gray-light;
   border-bottom: 1px solid $border-color;
   transition: padding $sidebar-transition-duration;
@@ -419,7 +416,6 @@
 }
 
 .page-with-layout-nav {
-  margin-top: $header-height + 2;
 
   .right-sidebar {
     top: ($header-height * 2) + 2;
diff --git a/app/assets/stylesheets/framework/sidebar.scss b/app/assets/stylesheets/framework/sidebar.scss
index f0b03710c79..41e50ce7bb9 100644
--- a/app/assets/stylesheets/framework/sidebar.scss
+++ b/app/assets/stylesheets/framework/sidebar.scss
@@ -1,5 +1,5 @@
 .page-with-sidebar {
-  padding: $header-height 0 25px;
+  padding-bottom: 25px;
   transition: padding $sidebar-transition-duration;
 
   &.page-sidebar-pinned {
diff --git a/app/views/layouts/header/_default.html.haml b/app/views/layouts/header/_default.html.haml
index 9ecc0d11c95..59082ce5fd5 100644
--- a/app/views/layouts/header/_default.html.haml
+++ b/app/views/layouts/header/_default.html.haml
@@ -1,4 +1,4 @@
-%header.navbar.navbar-fixed-top.navbar-gitlab{ class: nav_header_class }
+%header.navbar.navbar-gitlab{ class: nav_header_class }
   %a.sr-only.gl-accessibility{ href: "#content-body", tabindex: "1" } Skip to content
   .container-fluid
     .header-content
diff --git a/spec/javascripts/fixtures/header.html.haml b/spec/javascripts/fixtures/header.html.haml
index 4db2ef604de..f397f69e753 100644
--- a/spec/javascripts/fixtures/header.html.haml
+++ b/spec/javascripts/fixtures/header.html.haml
@@ -1,4 +1,4 @@
-%header.navbar.navbar-fixed-top.navbar-gitlab.nav_header_class
+%header.navbar.navbar-gitlab.nav_header_class
   .container-fluid
     .header-content
       %button.side-nav-toggle