Fixes

5 files changed, 130 insertions, 129 deletions

diff --git a/app/assets/stylesheets/framework/header.scss b/app/assets/stylesheets/framework/header.scss
index d932ea8794f..63eed636476 100644
--- a/app/assets/stylesheets/framework/header.scss
+++ b/app/assets/stylesheets/framework/header.scss
@@ -6,8 +6,6 @@
 header {
   @include new-style-dropdown;
 
-  transition: padding $sidebar-transition-duration;
-
   &.navbar-empty {
     height: $header-height;
     background: $white-light;
@@ -313,95 +311,3 @@ header {
     color: $red-500;
   }
 }
-
-.with-performance-bar header.navbar-gitlab {
-  top: $performance-bar-height;
-}
-
-.navbar-nav {
-  li {
-    .badge {
-      position: inherit;
-      font-weight: $gl-font-weight-normal;
-      margin-left: -6px;
-      font-size: 11px;
-      color: $white-light;
-      padding: 0 5px;
-      line-height: 12px;
-      border-radius: 7px;
-      box-shadow: 0 1px 0 rgba($gl-header-color, .2);
-
-      &.issues-count {
-        background-color: $green-500;
-      }
-
-      &.merge-requests-count {
-        background-color: $orange-600;
-      }
-
-      &.todos-count {
-        background-color: $blue-500;
-      }
-    }
-  }
-}
-
-@media (max-width: $screen-xs-max) {
-  header .container-fluid {
-    font-size: 18px;
-
-    .navbar-nav {
-      display: table;
-      table-layout: fixed;
-      width: 100%;
-      margin: 0;
-      text-align: right;
-    }
-
-    .navbar-collapse {
-      padding-left: 5px;
-
-      .nav > li:not(.hidden-xs) {
-        display: table-cell !important;
-        width: 25%;
-
-        a {
-          margin-right: 8px;
-        }
-      }
-    }
-  }
-
-  .header-user-dropdown-toggle {
-    text-align: center;
-  }
-
-  .header-user-avatar {
-    float: none;
-  }
-}
-
-.header-user {
-  .dropdown-menu-nav {
-    width: auto;
-    min-width: 140px;
-    margin-top: -5px;
-    color: $gl-text-color;
-    left: auto;
-
-    .current-user {
-      padding: 5px 18px;
-
-      .user-name {
-        display: block;
-      }
-    }
-  }
-}
-
-.header-user-avatar {
-  float: left;
-  margin-right: 5px;
-  border-radius: 50%;
-  border: 1px solid $avatar-border;
-}
diff --git a/app/assets/stylesheets/framework/nav.scss b/app/assets/stylesheets/framework/nav.scss
index ca206ce818f..8b137891791 100644
--- a/app/assets/stylesheets/framework/nav.scss
+++ b/app/assets/stylesheets/framework/nav.scss
@@ -1,36 +1 @@
-.project-item-select-holder.btn-group {
-  display: flex;
-  max-width: 350px;
-  overflow: hidden;
-  float: right;
 
-  .new-project-item-link {
-    white-space: nowrap;
-    overflow: hidden;
-    text-overflow: ellipsis;
-  }
-
-  .new-project-item-select-button {
-    width: 32px;
-  }
-}
-
-.empty-state .project-item-select-holder.btn-group {
-  float: none;
-  display: inline-block;
-
-  .btn {
-    // overrides styles applied to plain `.empty-state .btn`
-    margin: 10px 0;
-    max-width: 300px;
-    width: auto;
-
-    @media(max-width: $screen-xs-max) {
-      max-width: 250px;
-    }
-  }
-}
-
-.new-project-item-select-button .fa-caret-down {
-  margin-left: 2px;
-}
diff --git a/app/assets/stylesheets/framework/new-nav.scss b/app/assets/stylesheets/framework/new-nav.scss
index 3663ebf3039..0ee07b18b1f 100644
--- a/app/assets/stylesheets/framework/new-nav.scss
+++ b/app/assets/stylesheets/framework/new-nav.scss
@@ -397,3 +397,95 @@ header.navbar-gitlab-new {
     background-color: $white-light;
   }
 }
+
+.navbar-nav {
+  li {
+    .badge {
+      position: inherit;
+      font-weight: $gl-font-weight-normal;
+      margin-left: -6px;
+      font-size: 11px;
+      color: $white-light;
+      padding: 0 5px;
+      line-height: 12px;
+      border-radius: 7px;
+      box-shadow: 0 1px 0 rgba($gl-header-color, .2);
+
+      &.issues-count {
+        background-color: $green-500;
+      }
+
+      &.merge-requests-count {
+        background-color: $orange-600;
+      }
+
+      &.todos-count {
+        background-color: $blue-500;
+      }
+    }
+  }
+}
+
+@media (max-width: $screen-xs-max) {
+  header .container-fluid {
+    font-size: 18px;
+
+    .navbar-nav {
+      display: table;
+      table-layout: fixed;
+      width: 100%;
+      margin: 0;
+      text-align: right;
+    }
+
+    .navbar-collapse {
+      padding-left: 5px;
+
+      .nav > li:not(.hidden-xs) {
+        display: table-cell !important;
+        width: 25%;
+
+        a {
+          margin-right: 8px;
+        }
+      }
+    }
+  }
+
+  .header-user-dropdown-toggle {
+    text-align: center;
+  }
+
+  .header-user-avatar {
+    float: none;
+  }
+}
+
+.header-user {
+  .dropdown-menu-nav {
+    width: auto;
+    min-width: 140px;
+    margin-top: -5px;
+    color: $gl-text-color;
+    left: auto;
+
+    .current-user {
+      padding: 5px 18px;
+
+      .user-name {
+        display: block;
+      }
+    }
+  }
+}
+
+.header-user-avatar {
+  float: left;
+  margin-right: 5px;
+  border-radius: 50%;
+  border: 1px solid $avatar-border;
+}
+
+.with-performance-bar header.navbar-gitlab {
+  top: $performance-bar-height;
+}
diff --git a/app/assets/stylesheets/framework/secondary-navigation-elements.scss b/app/assets/stylesheets/framework/secondary-navigation-elements.scss
index 5be6bae3368..5c96b3b78e7 100644
--- a/app/assets/stylesheets/framework/secondary-navigation-elements.scss
+++ b/app/assets/stylesheets/framework/secondary-navigation-elements.scss
@@ -337,3 +337,40 @@
     }
   }
 }
+
+.project-item-select-holder.btn-group {
+  display: flex;
+  max-width: 350px;
+  overflow: hidden;
+  float: right;
+
+  .new-project-item-link {
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+  }
+
+  .new-project-item-select-button {
+    width: 32px;
+  }
+}
+
+.empty-state .project-item-select-holder.btn-group {
+  float: none;
+  display: inline-block;
+
+  .btn {
+    // overrides styles applied to plain `.empty-state .btn`
+    margin: 10px 0;
+    max-width: 300px;
+    width: auto;
+
+    @media(max-width: $screen-xs-max) {
+      max-width: 250px;
+    }
+  }
+}
+
+.new-project-item-select-button .fa-caret-down {
+  margin-left: 2px;
+}
diff --git a/app/assets/stylesheets/pages/search.scss b/app/assets/stylesheets/pages/search.scss
index 89ebe3f9917..db0a04a5eb3 100644
--- a/app/assets/stylesheets/pages/search.scss
+++ b/app/assets/stylesheets/pages/search.scss
@@ -47,6 +47,7 @@ input[type="checkbox"]:hover {
   }
 
   .location-badge {
+    height: 32px;
     font-size: 12px;
     margin: -4px 4px -4px -4px;
     line-height: 25px;