Merge branch 'winh-dropdown-mixin' into 'master'

Use mixin for new dropdown style

See merge request !13274

4 files changed, 11 insertions, 64 deletions

diff --git a/app/assets/stylesheets/framework/dropdowns.scss b/app/assets/stylesheets/framework/dropdowns.scss
index 572203bce34..89dd99831e4 100644
--- a/app/assets/stylesheets/framework/dropdowns.scss
+++ b/app/assets/stylesheets/framework/dropdowns.scss
@@ -725,7 +725,8 @@
 
 // TODO: change global style and remove mixin
 @mixin new-style-dropdown {
-  .dropdown-menu {
+  .dropdown-menu,
+  .dropdown-menu-nav {
     li {
       padding: 0 1px;
 
@@ -766,4 +767,8 @@
       }
     }
   }
+
+  .dropdown-menu-align-right {
+    margin-top: 2px;
+  }
 }
diff --git a/app/assets/stylesheets/framework/header.scss b/app/assets/stylesheets/framework/header.scss
index 1c4238bc564..555e444a062 100644
--- a/app/assets/stylesheets/framework/header.scss
+++ b/app/assets/stylesheets/framework/header.scss
@@ -4,6 +4,8 @@
  */
 
 header {
+  @include new-style-dropdown;
+
   transition: padding $sidebar-transition-duration;
 
   &.navbar-empty {
@@ -313,25 +315,6 @@ header {
   .impersonation i {
     color: $red-500;
   }
-
-  // TODO: fallback to global style
-  .dropdown-menu,
-  .dropdown-menu-nav {
-    li {
-      padding: 0 1px;
-
-      a {
-        border-radius: 0;
-        padding: 8px 16px;
-
-        &:hover,
-        &:active,
-        &:focus {
-          background-color: $gray-darker;
-        }
-      }
-    }
-  }
 }
 
 .with-performance-bar header.navbar-gitlab {
diff --git a/app/assets/stylesheets/pages/cycle_analytics.scss b/app/assets/stylesheets/pages/cycle_analytics.scss
index 87b50c7687e..6753eb08285 100644
--- a/app/assets/stylesheets/pages/cycle_analytics.scss
+++ b/app/assets/stylesheets/pages/cycle_analytics.scss
@@ -1,4 +1,6 @@
 #cycle-analytics {
+  @include new-style-dropdown;
+
   max-width: 1000px;
   margin: 24px auto 0;
   position: relative;
@@ -110,10 +112,6 @@
 
   .js-ca-dropdown {
     top: $gl-padding-top;
-
-    .dropdown-menu-align-right {
-      margin-top: 2px;
-    }
   }
 
   .content-list {
@@ -446,24 +444,6 @@
       margin-bottom: 20px;
     }
   }
-
-  // TODO: fallback to global style
-  .dropdown-menu {
-    li {
-      padding: 0 1px;
-
-      a {
-        border-radius: 0;
-        padding: 8px 16px;
-
-        &:hover,
-        &:active,
-        &:focus {
-          background-color: $gray-darker;
-        }
-      }
-    }
-  }
 }
 
 .cycle-analytics-overview {
diff --git a/app/assets/stylesheets/pages/tree.scss b/app/assets/stylesheets/pages/tree.scss
index e0f46172769..44ab07a4367 100644
--- a/app/assets/stylesheets/pages/tree.scss
+++ b/app/assets/stylesheets/pages/tree.scss
@@ -1,4 +1,5 @@
 .tree-holder {
+  @include new-style-dropdown;
 
   .nav-block {
     margin: 10px 0;
@@ -202,28 +203,6 @@
       }
     }
   }
-
-  // TODO: fallback to global style
-  .dropdown-menu:not(.dropdown-menu-selectable) {
-    li {
-      padding: 0 1px;
-
-      &.dropdown-header {
-        padding: 8px 16px;
-      }
-
-      a {
-        border-radius: 0;
-        padding: 8px 16px;
-
-        &:hover,
-        &:active,
-        &:focus {
-          background-color: $gray-darker;
-        }
-      }
-    }
-  }
 }
 
 .blob-commit-info {