diff options
| author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-10-30 18:09:55 +0000 |
|---|---|---|
| committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-10-30 18:09:55 +0000 |
| commit | bba020a56cbedd6403b637ec7f9eaee258eb7c67 (patch) | |
| tree | 9be280012ae471768c52fbe0b6661ba8afe74eb9 /app/assets/stylesheets/framework | |
| parent | bb63ee682aac171db00bfd2c37395fa1f77a3cae (diff) | |
| parent | 1cd0fbd96b29c0713a926fe9602eae703f77525d (diff) | |
| download | gitlab-ce-bba020a56cbedd6403b637ec7f9eaee258eb7c67.tar.gz | |
Merge branch '39582-nestingdepth-6' into 'master'39635-convert-jquery-scrollto-js-library-to-be-a-yarn-managed-library
Enable NestingDepth (level 6) on scss-lint
Closes #39582
See merge request gitlab-org/gitlab-ce!15073
Diffstat (limited to 'app/assets/stylesheets/framework')
| -rw-r--r-- | app/assets/stylesheets/framework/gitlab-theme.scss | 7 | ||||
| -rw-r--r-- | app/assets/stylesheets/framework/header.scss | 6 |
2 files changed, 4 insertions, 9 deletions
diff --git a/app/assets/stylesheets/framework/gitlab-theme.scss b/app/assets/stylesheets/framework/gitlab-theme.scss index 52b87de7a3d..dc591c06c88 100644 --- a/app/assets/stylesheets/framework/gitlab-theme.scss +++ b/app/assets/stylesheets/framework/gitlab-theme.scss @@ -216,12 +216,9 @@ body { color: $theme-gray-900; } - &.active > a { + &.active > a, + &.active > a:hover { color: $white-light; - - &:hover { - color: $white-light; - } } } } diff --git a/app/assets/stylesheets/framework/header.scss b/app/assets/stylesheets/framework/header.scss index d79444fad79..62ba74ff582 100644 --- a/app/assets/stylesheets/framework/header.scss +++ b/app/assets/stylesheets/framework/header.scss @@ -239,10 +239,8 @@ fill: currentColor; } - &.header-user-dropdown-toggle { - .header-user-avatar { - border-color: $white-light; - } + &.header-user-dropdown-toggle .header-user-avatar { + border-color: $white-light; } } } |