Merge branch 'project-dropdown-list-overflow' into 'master'

Don't overflow project/group dropdown results

Closes #49382 and #49379

See merge request gitlab-org/gitlab-ce!20704

2 files changed, 7 insertions, 5 deletions

diff --git a/app/assets/stylesheets/framework/dropdowns.scss b/app/assets/stylesheets/framework/dropdowns.scss
index c7b5e22c33d..ec4a0f378d0 100644
--- a/app/assets/stylesheets/framework/dropdowns.scss
+++ b/app/assets/stylesheets/framework/dropdowns.scss
@@ -822,7 +822,7 @@ header.header-content .dropdown-menu.frequent-items-dropdown-menu {
   display: flex;
   flex-direction: row;
   width: 500px;
-  height: 334px;
+  height: 354px;
 
   .frequent-items-dropdown-sidebar,
   .frequent-items-dropdown-content {
@@ -868,6 +868,7 @@ header.header-content .dropdown-menu.frequent-items-dropdown-menu {
   }
 
   .frequent-items-list-container {
+    height: 304px;
     padding: 8px 0;
     overflow-y: auto;
 
@@ -897,10 +898,6 @@ header.header-content .dropdown-menu.frequent-items-dropdown-menu {
     margin-top: 8px;
   }
 
-  .frequent-items-search-container {
-    height: 284px;
-  }
-
   @include media-breakpoint-down(xs) {
     .frequent-items-list-container {
       width: auto;
diff --git a/changelogs/unreleased/project-dropdown-list-overflow.yml b/changelogs/unreleased/project-dropdown-list-overflow.yml
new file mode 100644
index 00000000000..9b74a68291b
--- /dev/null
+++ b/changelogs/unreleased/project-dropdown-list-overflow.yml
@@ -0,0 +1,5 @@
+---
+title: Don't overflow project/group dropdown results
+merge_request: 20704
+author: gfyoung
+type: fixed