summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWinnie Hellmann <winnie@gitlab.com>2017-10-09 15:15:40 +0200
committerWinnie Hellmann <winnie@gitlab.com>2017-12-08 11:56:04 +0100
commitbb133ff79afcef9ac4faf8190a7939518ab31642 (patch)
tree1f5ddc1ef6c554bb7362aa19b8e857f3582ba2c5
parent244ac208140cef2f3534f5449cc1ea5907fa813a (diff)
downloadgitlab-ce-bb133ff79afcef9ac4faf8190a7939518ab31642.tar.gz
Make new .dropdown-menu-selectable style global
-rw-r--r--app/assets/stylesheets/framework/dropdowns.scss67
1 files changed, 28 insertions, 39 deletions
diff --git a/app/assets/stylesheets/framework/dropdowns.scss b/app/assets/stylesheets/framework/dropdowns.scss
index 0494a105195..70cbdd6483d 100644
--- a/app/assets/stylesheets/framework/dropdowns.scss
+++ b/app/assets/stylesheets/framework/dropdowns.scss
@@ -484,39 +484,41 @@
}
.dropdown-menu-selectable {
- a {
- padding-left: 26px;
- position: relative;
+ li {
+ a {
+ padding: 8px 40px;
+ position: relative;
- &.is-indeterminate,
- &.is-active {
- color: $gl-text-color;
-
- &::before {
- position: absolute;
- left: 6px;
- top: 16px;
- transform: translateY(-50%);
- font: normal normal normal 14px/1 FontAwesome;
- font-size: inherit;
- text-rendering: auto;
- -webkit-font-smoothing: antialiased;
- -moz-osx-font-smoothing: grayscale;
- }
+ &.is-indeterminate,
+ &.is-active {
+ color: $gl-text-color;
- &.dropdown-menu-user-link {
&::before {
- top: 50%;
+ position: absolute;
+ left: 16px;
+ top: 16px;
+ transform: translateY(-50%);
+ font: normal normal normal 14px/1 FontAwesome;
+ font-size: inherit;
+ text-rendering: auto;
+ -webkit-font-smoothing: antialiased;
+ -moz-osx-font-smoothing: grayscale;
+ }
+
+ &.dropdown-menu-user-link {
+ &::before {
+ top: 50%;
+ }
}
}
- }
- &.is-indeterminate::before {
- content: "\f068";
- }
+ &.is-indeterminate::before {
+ content: "\f068";
+ }
- &.is-active::before {
- content: "\f00c";
+ &.is-active::before {
+ content: "\f00c";
+ }
}
}
}
@@ -758,19 +760,6 @@
#{$selector}.dropdown-menu,
#{$selector}.dropdown-menu-nav {
margin-bottom: 24px;
-
- &.dropdown-menu-selectable {
- li {
- a {
- padding: 8px 40px;
-
- &.is-indeterminate::before,
- &.is-active::before {
- left: 16px;
- }
- }
- }
- }
}
#{$selector}.dropdown-menu-align-right {