Merge branch 'master' into 38464-k8s-apps

Conflicts:
	db/schema.rb

1 files changed, 3 insertions, 73 deletions

diff --git a/app/assets/stylesheets/framework/header.scss b/app/assets/stylesheets/framework/header.scss
index 5d777f0d468..1cdfa904374 100644
--- a/app/assets/stylesheets/framework/header.scss
+++ b/app/assets/stylesheets/framework/header.scss
@@ -10,7 +10,7 @@
     z-index: 1000;
     margin-bottom: 0;
     min-height: $header-height;
-    border: none;
+    border: 0;
     border-bottom: 1px solid $border-color;
     position: fixed;
     top: 0;
@@ -169,7 +169,7 @@
 
   .navbar-collapse {
     flex: 0 0 auto;
-    border-top: none;
+    border-top: 0;
     padding: 0;
 
     @media (max-width: $screen-xs-max) {
@@ -352,77 +352,7 @@
 
 .header-user .dropdown-menu-nav,
 .header-new .dropdown-menu-nav {
-  margin-top: 4px;
-}
-
-.search {
-  margin: 4px 8px 0;
-
-  form {
-    height: 32px;
-    border: 0;
-    border-radius: $border-radius-default;
-    transition: border-color ease-in-out 0.15s, background-color ease-in-out 0.15s;
-
-    &:hover {
-      box-shadow: none;
-    }
-  }
-
-  .search-input {
-    color: $white-light;
-    background: none;
-    transition: color ease-in-out 0.15s;
-  }
-
-  .search-input::placeholder {
-    transition: color ease-in-out 0.15s;
-  }
-
-  .location-badge {
-    font-size: 12px;
-    margin: -4px 4px -4px -4px;
-    line-height: 25px;
-    padding: 4px 8px;
-    border-radius: 2px 0 0 2px;
-    height: 32px;
-    transition: border-color ease-in-out 0.15s;
-  }
-
-  &.search-active {
-    form {
-      background-color: rgba($indigo-200, .3);
-      box-shadow: none;
-
-      .search-input {
-        color: $gl-text-color;
-        transition: color ease-in-out 0.15s;
-      }
-
-      .search-input::placeholder {
-        color: $gl-text-color-tertiary;
-      }
-
-      .search-input-wrap {
-        .search-icon,
-        .clear-icon {
-          color: $gl-text-color-tertiary;
-          transition: color ease-in-out 0.15s;
-        }
-      }
-    }
-
-    .location-badge {
-      background-color: $nav-badge-bg;
-      border-color: $border-color;
-    }
-
-    .search-input-wrap {
-      .clear-icon {
-        color: $white-light;
-      }
-    }
-  }
+  margin-top: $dropdown-vertical-offset;
 }
 
 .breadcrumbs {