diff options
| author | Andrew Newdigate <andrew@gitlab.com> | 2017-11-01 14:41:17 +0000 |
|---|---|---|
| committer | Andrew Newdigate <andrew@gitlab.com> | 2017-11-01 14:41:17 +0000 |
| commit | 3cd29ffe53fa38ce1b77d2c4e0d806edd340d120 (patch) | |
| tree | 81a2548e1d268d9695571ddccbf68f070f018f68 /app/assets/stylesheets/framework/gitlab-theme.scss | |
| parent | a5f586c0361b371f6bfc24a6de219cf6a178d85e (diff) | |
| parent | 5c1459ef0f1fa4f091ccb735aba9fd918f53105d (diff) | |
| download | gitlab-ce-an/gitaly-timeouts.tar.gz | |
Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into an/gitaly-timeoutsan/gitaly-timeouts
# Conflicts:
# app/models/application_setting.rb
# db/schema.rb
Diffstat (limited to 'app/assets/stylesheets/framework/gitlab-theme.scss')
| -rw-r--r-- | app/assets/stylesheets/framework/gitlab-theme.scss | 7 |
1 files changed, 2 insertions, 5 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; - } } } } |