summaryrefslogtreecommitdiff
path: root/app/assets/stylesheets/framework/dropdowns.scss
diff options
context:
space:
mode:
Diffstat (limited to 'app/assets/stylesheets/framework/dropdowns.scss')
-rw-r--r--app/assets/stylesheets/framework/dropdowns.scss24
1 files changed, 5 insertions, 19 deletions
diff --git a/app/assets/stylesheets/framework/dropdowns.scss b/app/assets/stylesheets/framework/dropdowns.scss
index 41fc4d3dd4e..f56d8f2c2a9 100644
--- a/app/assets/stylesheets/framework/dropdowns.scss
+++ b/app/assets/stylesheets/framework/dropdowns.scss
@@ -216,7 +216,7 @@
position: absolute;
width: auto;
top: 100%;
- z-index: 300;
+ z-index: $zindex-dropdown-menu;
min-width: 240px;
max-width: 500px;
margin-top: $dropdown-vertical-offset;
@@ -326,7 +326,7 @@
color: $gl-text-color-secondary;
}
- .badge.badge-pill + span:not(.badge.badge-pill) {
+ .badge.badge-pill + span:not(.badge):not(.badge-pill) {
// Expects up to 3 digits on the badge
margin-right: 40px;
}
@@ -497,7 +497,7 @@
li {
a,
button,
- .dropdown-item {
+ .dropdown-item:not(.open-with-link) {
padding: 8px 40px;
position: relative;
@@ -525,7 +525,7 @@
&.is-active {
/* stylelint-disable-next-line function-url-quotes */
- background: url(asset_path('checkmark.png')) no-repeat 14px 8px;
+ background: url(asset_path('checkmark.png')) no-repeat 14px center;
}
}
}
@@ -896,7 +896,7 @@ header.header-content .dropdown-menu.frequent-items-dropdown-menu {
position: absolute;
top: 13px;
right: 25px;
- color: $gray-50;
+ color: $gray-300;
}
}
@@ -1093,17 +1093,3 @@ header.header-content .dropdown-menu.frequent-items-dropdown-menu {
width: $gl-dropdown-width-wide;
}
}
-
-.gl-dropdown-item-deprecated-adapter {
- .dropdown-item {
- align-items: flex-start;
-
- .gl-new-dropdown-item-text-primary {
- @include gl-font-weight-bold;
- }
-
- .gl-new-dropdown-item-text-secondary {
- color: inherit;
- }
- }
-}