diff options
| author | Annabel Dunstone Gray <annabel.m.gray@gmail.com> | 2019-07-10 14:22:59 +0000 |
|---|---|---|
| committer | Annabel Dunstone Gray <annabel.m.gray@gmail.com> | 2019-07-10 14:22:59 +0000 |
| commit | 473d36d1acc016b6cc494d1568bc31371531c724 (patch) | |
| tree | cb5e4ad86c7366a0ded52d1089de83bd73f1e31d /app/assets/stylesheets/framework | |
| parent | e787676b3752405cbe4ae75788c6cff53154783d (diff) | |
| parent | 91fff39efeb0aabec81c10f5d4e969ebbd385488 (diff) | |
| download | gitlab-ce-473d36d1acc016b6cc494d1568bc31371531c724.tar.gz | |
Merge branch 'fixed-dropdown-hover-styles' into 'master'
Fixed dropdown hover styles
Closes #64330 and #64340
See merge request gitlab-org/gitlab-ce!30534
Diffstat (limited to 'app/assets/stylesheets/framework')
| -rw-r--r-- | app/assets/stylesheets/framework/dropdowns.scss | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/app/assets/stylesheets/framework/dropdowns.scss b/app/assets/stylesheets/framework/dropdowns.scss index e75c1379dfb..29f63e9578d 100644 --- a/app/assets/stylesheets/framework/dropdowns.scss +++ b/app/assets/stylesheets/framework/dropdowns.scss @@ -63,7 +63,8 @@ margin-top: 11px; } -.dropdown-toggle { +.dropdown-toggle, +.confidential-merge-request-fork-group .dropdown-toggle { padding: 6px 8px 6px 10px; background-color: $white-light; color: $gl-text-color; @@ -288,7 +289,7 @@ padding: 0 1px; a, - button:not(.dropdown-toggle,.ci-action-icon-container), + button, .menu-item { @include dropdown-link; } |