Fix media queries for absolutely positioned nav element

app/assets/stylesheets/framework/header.scss

@@ -22,7 +22,7 @@ header {
   }
 
   &.navbar-gitlab {
-    padding: 0 20px;
+    padding: 0 16px;
     z-index: 100;
     margin-bottom: 0;
     min-height: $header-height;

app/assets/stylesheets/framework/nav.scss

@@ -201,9 +201,13 @@
   border-bottom: 1px solid $border-color;
   transition-duration: .3s;
 
+  .container-fluid {
+    position: relative;
+  }
+
   .controls {
     float: right;
-    padding: 7px 5px 0 0;
+    padding: 7px 0 0;
 
     i {
       color: $layout-link-gray;

app/assets/stylesheets/framework/sidebar.scss

@@ -323,11 +323,17 @@
   }
 
   .layout-nav {
-    padding-right: $sidebar_width;
-
     @media (max-width: $screen-xs-min) {
       padding-right: 0;;
     }
+
+    @media (min-width: $screen-xs-min) and (max-width: $screen-md-min) {
+      padding-right: 62px;
+    }
+
+    @media (min-width: $screen-md-min) {
+      padding-right: $sidebar_width;
+    }
   }
 }