Add latest changes from gitlab-org/gitlab@master

2 files changed, 0 insertions, 53 deletions

diff --git a/app/assets/stylesheets/framework/header.scss b/app/assets/stylesheets/framework/header.scss
index e269ea68e41..4ef536bf49d 100644
--- a/app/assets/stylesheets/framework/header.scss
+++ b/app/assets/stylesheets/framework/header.scss
@@ -1,6 +1,3 @@
-$search-input-field-min-width: 320px;
-$search-input-field-x-min-width: 200px;
-
 .navbar-gitlab {
   padding: 0 16px;
   z-index: $header-zindex;
@@ -76,47 +73,6 @@ $search-input-field-x-min-width: 200px;
     }
   }
 
-  .header-search-form {
-    min-width: $search-input-field-min-width;
-
-    // This is a temporary workaround!
-    // the button in GitLab UI Search components need to be updated to not be the small size
-    // see in Figma: https://www.figma.com/file/qEddyqCrI7kPSBjGmwkZzQ/Component-library?node-id=43905%3A45540
-    .gl-search-box-by-type-clear.btn-sm {
-      padding: 0.5rem !important;
-    }
-
-    @include media-breakpoint-between(md, lg) {
-      min-width: $search-input-field-x-min-width;
-    }
-
-    &.is-searching {
-      .in-search-scope-help {
-        position: absolute;
-        top: $gl-spacing-scale-2;
-        right: 2.125rem;
-        z-index: 2;
-      }
-    }
-
-    &.is-not-focused {
-      .gl-search-box-by-type-clear {
-        display: none;
-      }
-    }
-
-    .keyboard-shortcut-helper {
-      transform: translateY(calc(50% - 2px));
-      box-shadow: none;
-      border-color: transparent;
-    }
-  }
-
-  .header-search-dropdown-menu {
-    max-height: $dropdown-max-height;
-    top: 100%;
-  }
-
   .navbar-collapse {
     flex: 0 0 auto;
     border-top: 0;
diff --git a/app/assets/stylesheets/framework/snippets.scss b/app/assets/stylesheets/framework/snippets.scss
index 9f8d5d25cb8..edd07dbaafa 100644
--- a/app/assets/stylesheets/framework/snippets.scss
+++ b/app/assets/stylesheets/framework/snippets.scss
@@ -29,17 +29,8 @@
   }
 }
 
-.snippet-header {
-  padding: $gl-padding 0;
-}
-
 .snippet-title {
   color: $gl-text-color;
   font-size: 2em;
   font-weight: $gl-font-weight-bold;
-  min-height: $header-height;
-}
-
-.snippet-scope-menu .btn-success {
-  margin-top: 15px;
 }