Commit cc72e1bc authored by Phil Hughes's avatar Phil Hughes

Merge branch '42579-fix-sidebar-dropdown-hover-style' into 'master'

Resolve "Hover style for sidebar dropdowns is wrong"

Closes #42579

See merge request gitlab-org/gitlab-ce!17519
parents 30bebe04 91e87ab5
...@@ -137,12 +137,22 @@ ...@@ -137,12 +137,22 @@
z-index: 200; z-index: 200;
overflow: hidden; overflow: hidden;
a:not(.btn-retry), a:not(.btn) {
.btn-link {
color: inherit; color: inherit;
&:hover {
color: $gl-link-hover-color;
.avatar {
border-color: rgba($avatar-border, .2);
}
}
} }
.btn-link { .btn-link {
color: inherit;
outline: none; outline: none;
} }
...@@ -214,7 +224,7 @@ ...@@ -214,7 +224,7 @@
&:hover { &:hover {
text-decoration: underline; text-decoration: underline;
color: $md-link-color; color: $gl-link-hover-color;
} }
} }
} }
...@@ -486,16 +496,6 @@ ...@@ -486,16 +496,6 @@
} }
} }
a:not(.btn-retry) {
&:hover {
color: $md-link-color;
.avatar {
border-color: rgba($avatar-border, .2);
}
}
}
.dropdown-menu-toggle { .dropdown-menu-toggle {
width: 100%; width: 100%;
padding-top: 6px; padding-top: 6px;
...@@ -503,6 +503,20 @@ ...@@ -503,6 +503,20 @@
.dropdown-menu { .dropdown-menu {
width: 100%; width: 100%;
/*
* Overwrite hover style for dropdown items, so that they are not blue
* This should be removed during dev of https://gitlab.com/gitlab-org/gitlab-ce/issues/44040
*/
li a {
&:hover,
&:active,
&:focus,
&.is-focused {
@include dropdown-item-hover;
}
}
} }
} }
......
---
title: Fix hover style of dropdown items in the right sidebar
merge_request: 17519
author:
type: fixed
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