diff options
author | Phil Hughes <me@iamphill.com> | 2017-07-19 07:46:28 +0000 |
---|---|---|
committer | Phil Hughes <me@iamphill.com> | 2017-07-19 07:46:28 +0000 |
commit | c06048a15da225d710dbdc7af0c7a408cfd19c3e (patch) | |
tree | 32f52e997b8357b9e93dc63bb8b45870a39c1603 /app | |
parent | 6f73ac8a416935d92147f3f7faf24e051ec8ef13 (diff) | |
parent | e4a3c45e7e138f673958b01840821ae536b9fd87 (diff) | |
download | gitlab-ce-c06048a15da225d710dbdc7af0c7a408cfd19c3e.tar.gz |
Merge branch '35210-disable-nav-animations' into 'master'
Remove transitions on nav link hover
Closes #35210
See merge request !12950
Diffstat (limited to 'app')
-rw-r--r-- | app/assets/stylesheets/new_sidebar.scss | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/app/assets/stylesheets/new_sidebar.scss b/app/assets/stylesheets/new_sidebar.scss index 82cabefa129..bd9a5d7392d 100644 --- a/app/assets/stylesheets/new_sidebar.scss +++ b/app/assets/stylesheets/new_sidebar.scss @@ -65,7 +65,6 @@ $new-sidebar-width: 220px; .settings-avatar { background-color: $white-light; - transition: background-color 100ms linear; i { font-size: 20px; @@ -73,7 +72,6 @@ $new-sidebar-width: 220px; color: $gl-text-color-secondary; text-align: center; align-self: center; - transition: color 100ms linear; } } @@ -90,6 +88,7 @@ $new-sidebar-width: 220px; box-shadow: inset -2px 0 0 $border-color; a { + transition: none; text-decoration: none; } @@ -177,7 +176,6 @@ $new-sidebar-width: 220px; color: $hover-color; .badge { - transition: background-color 100ms linear, color 100ms linear; background-color: $indigo-500; color: $hover-color; } |