From b8ab159a930958f919938055b1dd46147610b79b Mon Sep 17 00:00:00 2001
From: Annabel Gray <annabel.m.gray@gmail.com>
Date: Tue, 5 Jun 2018 01:49:36 +0000
Subject: Merge branch '47158-bs4-nav-projects-dropdown-overflow' into 'master'

Resolve "Projects \/ menu displays scrolls bar for short period of time"

Closes #47158

See merge request gitlab-org/gitlab-ce!19404
---
 app/assets/stylesheets/framework/dropdowns.scss | 6 ++++++
 app/assets/stylesheets/framework/header.scss    | 6 ------
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/assets/stylesheets/framework/dropdowns.scss b/app/assets/stylesheets/framework/dropdowns.scss
index b91d579cae6..74475daae14 100644
--- a/app/assets/stylesheets/framework/dropdowns.scss
+++ b/app/assets/stylesheets/framework/dropdowns.scss
@@ -35,6 +35,12 @@
     @include media-breakpoint-down(xs) {
       width: 100%;
     }
+
+    &.projects-dropdown-menu {
+      padding: 0;
+      overflow-y: initial;
+      max-height: initial;
+    }
   }
 
   .dropdown-toggle,
diff --git a/app/assets/stylesheets/framework/header.scss b/app/assets/stylesheets/framework/header.scss
index 2085e5646ef..094134b63b0 100644
--- a/app/assets/stylesheets/framework/header.scss
+++ b/app/assets/stylesheets/framework/header.scss
@@ -297,12 +297,6 @@
   display: flex;
   margin: 0 0 0 6px;
 
-  .projects-dropdown-menu {
-    padding: 0;
-    overflow-y: initial;
-    max-height: initial;
-  }
-
   .dropdown-chevron {
     position: relative;
     top: -1px;
-- 
cgit v1.2.1