summaryrefslogtreecommitdiff
path: root/app/assets/stylesheets/framework/dropdowns.scss
diff options
context:
space:
mode:
authorClement Ho <clemmakesapps@gmail.com>2017-09-07 18:38:50 +0000
committerClement Ho <clemmakesapps@gmail.com>2017-09-07 18:38:50 +0000
commit354a12c3d1afcad7e36f06eafb03f795aa5d6a29 (patch)
treee47d35214a222c97b039f8bbd9eab9175d976e17 /app/assets/stylesheets/framework/dropdowns.scss
parent22d6e69ecf004060de31823a8242d249a88c4e46 (diff)
parent37c76cecb94518245179369d1762be8c3b6799ca (diff)
downloadgitlab-ce-354a12c3d1afcad7e36f06eafb03f795aa5d6a29.tar.gz
Merge branch 'winh-filter-dropdowns-keyboard-selection' into 'master'
Restore droplab item style for keyboard navigation Closes #37218 See merge request !13921
Diffstat (limited to 'app/assets/stylesheets/framework/dropdowns.scss')
-rw-r--r--app/assets/stylesheets/framework/dropdowns.scss11
1 files changed, 11 insertions, 0 deletions
diff --git a/app/assets/stylesheets/framework/dropdowns.scss b/app/assets/stylesheets/framework/dropdowns.scss
index cb501030356..2bcd23a15e6 100644
--- a/app/assets/stylesheets/framework/dropdowns.scss
+++ b/app/assets/stylesheets/framework/dropdowns.scss
@@ -734,6 +734,11 @@
overflow: hidden;
}
+@mixin dropdown-item-hover {
+ background-color: $dropdown-item-hover-bg;
+ color: $gl-text-color;
+}
+
// TODO: change global style and remove mixin
@mixin new-style-dropdown($selector: '') {
#{$selector}.dropdown-menu,
@@ -760,6 +765,10 @@
padding: 8px 16px;
}
+ &.droplab-item-active button {
+ @include dropdown-item-hover;
+ }
+
a,
button,
.menu-item {
@@ -779,6 +788,8 @@
&:hover,
&:active,
&:focus {
+ @include dropdown-item-hover;
+
background-color: $dropdown-item-hover-bg;
color: $gl-text-color;