Commit 00a02d14 authored by Annabel Dunstone Gray's avatar Annabel Dunstone Gray

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

Use mixin for new dropdown style

See merge request !13274
parents 080cd74a 8b7f4a6a
...@@ -725,7 +725,8 @@ ...@@ -725,7 +725,8 @@
// TODO: change global style and remove mixin // TODO: change global style and remove mixin
@mixin new-style-dropdown { @mixin new-style-dropdown {
.dropdown-menu { .dropdown-menu,
.dropdown-menu-nav {
li { li {
padding: 0 1px; padding: 0 1px;
...@@ -766,4 +767,8 @@ ...@@ -766,4 +767,8 @@
} }
} }
} }
.dropdown-menu-align-right {
margin-top: 2px;
}
} }
...@@ -4,6 +4,8 @@ ...@@ -4,6 +4,8 @@
*/ */
header { header {
@include new-style-dropdown;
transition: padding $sidebar-transition-duration; transition: padding $sidebar-transition-duration;
&.navbar-empty { &.navbar-empty {
...@@ -313,25 +315,6 @@ header { ...@@ -313,25 +315,6 @@ header {
.impersonation i { .impersonation i {
color: $red-500; 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 { .with-performance-bar header.navbar-gitlab {
......
#cycle-analytics { #cycle-analytics {
@include new-style-dropdown;
max-width: 1000px; max-width: 1000px;
margin: 24px auto 0; margin: 24px auto 0;
position: relative; position: relative;
...@@ -110,10 +112,6 @@ ...@@ -110,10 +112,6 @@
.js-ca-dropdown { .js-ca-dropdown {
top: $gl-padding-top; top: $gl-padding-top;
.dropdown-menu-align-right {
margin-top: 2px;
}
} }
.content-list { .content-list {
...@@ -446,24 +444,6 @@ ...@@ -446,24 +444,6 @@
margin-bottom: 20px; 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 { .cycle-analytics-overview {
......
.tree-holder { .tree-holder {
@include new-style-dropdown;
.nav-block { .nav-block {
margin: 10px 0; margin: 10px 0;
...@@ -202,28 +203,6 @@ ...@@ -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 { .blob-commit-info {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment