From b29414dfc0b5f24c3773596eae7bb9a70275a44e Mon Sep 17 00:00:00 2001
From: Annabel Dunstone Gray <annabel.dunstone@gmail.com>
Date: Fri, 12 May 2017 09:42:09 -0500
Subject: Clean up fixed navbar

---
 app/assets/stylesheets/framework/header.scss     | 6 +++---
 app/assets/stylesheets/pages/merge_requests.scss | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'app/assets/stylesheets')

diff --git a/app/assets/stylesheets/framework/header.scss b/app/assets/stylesheets/framework/header.scss
index 3014b133754..586511fe8d4 100644
--- a/app/assets/stylesheets/framework/header.scss
+++ b/app/assets/stylesheets/framework/header.scss
@@ -116,10 +116,10 @@ header {
 
   .navbar-border {
     height: 1px;
-    position: fixed;
-    left: 0;
+    position: absolute;
     right: 0;
-    top: 50px;
+    left: 0;
+    bottom: 0;
     background-color: $border-color;
     opacity: 0;
   }
diff --git a/app/assets/stylesheets/pages/merge_requests.scss b/app/assets/stylesheets/pages/merge_requests.scss
index d9ba1d4de4d..bb47e24d986 100644
--- a/app/assets/stylesheets/pages/merge_requests.scss
+++ b/app/assets/stylesheets/pages/merge_requests.scss
@@ -689,7 +689,7 @@
 }
 
 .merge-request-tabs-holder {
-  top: 0;
+  top: $header-height;
   z-index: 10;
   background-color: $white-light;
 
-- 
cgit v1.2.1