3 files changed, 20 insertions, 19 deletions
diff --git a/app/assets/stylesheets/components/avatar.scss b/app/assets/stylesheets/components/avatar.scss
index 3c8abe43070..c8f69bfdbaf 100644
--- a/app/assets/stylesheets/components/avatar.scss
+++ b/app/assets/stylesheets/components/avatar.scss
@@ -70,7 +70,8 @@ $avatar-sizes: (
 $identicon-backgrounds: $identicon-red, $identicon-purple, $identicon-indigo, $identicon-blue, $identicon-teal,
   $identicon-orange, $identicon-gray;
 
-%avatar-circle {
+.avatar,
+.avatar-container {
   float: left;
   margin-right: $gl-padding;
   border-radius: $avatar-radius;
@@ -84,7 +85,6 @@ $identicon-backgrounds: $identicon-red, $identicon-purple, $identicon-indigo, $i
 }
 
 .avatar {
-  @extend %avatar-circle;
   transition-property: none;
 
   width: 40px;
@@ -151,7 +151,6 @@ $identicon-backgrounds: $identicon-red, $identicon-purple, $identicon-indigo, $i
 }
 
 .avatar-container {
-  @extend %avatar-circle;
   overflow: hidden;
   display: flex;
 
diff --git a/app/assets/stylesheets/components/milestone_combobox.scss b/app/assets/stylesheets/components/milestone_combobox.scss
index f73ec4d5998..5d1709c22ec 100644
--- a/app/assets/stylesheets/components/milestone_combobox.scss
+++ b/app/assets/stylesheets/components/milestone_combobox.scss
@@ -1,8 +1,14 @@
-.selected-item {
-  /* stylelint-disable-next-line function-url-quotes */
-  background: url(asset_path('checkmark.png')) no-repeat 0 2px;
-}
+.milestone-combobox {
+  .selected-item {
+    /* stylelint-disable-next-line function-url-quotes */
+    background: url(asset_path('checkmark.png')) no-repeat 0 2px;
+  }
+
+  .dropdown-item-space {
+    padding: 8px 12px;
+  }
 
-.dropdown-item-space {
-  padding: 8px 12px;
+  .dropdown-menu.show {
+    overflow: hidden;
+  }
 }
diff --git a/app/assets/stylesheets/components/ref_selector.scss b/app/assets/stylesheets/components/ref_selector.scss
index 970a7b967ee..ded911c2492 100644
--- a/app/assets/stylesheets/components/ref_selector.scss
+++ b/app/assets/stylesheets/components/ref_selector.scss
@@ -1,17 +1,13 @@
 .ref-selector {
-  & &-dropdown-content {
-    // Setting a max height is necessary to allow the dropdown's content
-    // to control where and how scrollbars appear.
-    // This content is limited to the max-height of the dropdown
-    // ($dropdown-max-height-lg) minus the additional padding
-    // on the top and bottom (2 * $gl-padding-8)
-    max-height: $dropdown-max-height-lg - 2 * $gl-padding-8;
-  }
-
   .dropdown-menu.show {
     // Make the dropdown a little wider and longer than usual
     // since it contains quite a bit of content.
+    overflow: hidden;
     width: 20rem;
-    max-height: $dropdown-max-height-lg;
+
+    &,
+    .gl-new-dropdown-inner {
+      max-height: $dropdown-max-height-lg;
+    }
   }
 }