diff options
author | Phil Hughes <me@iamphill.com> | 2017-07-19 07:46:28 +0000 |
---|---|---|
committer | Mike Greiling <mike@pixelcog.com> | 2017-07-20 17:04:18 -0500 |
commit | 9cdfdac4455702563bf0231a0fd433d952b0311b (patch) | |
tree | d67671183c66bfc0ac7d8a98e33802004219b1c5 | |
parent | 5e15ff0c2e4da2ff5bc3da47b3e54e991981c123 (diff) | |
download | gitlab-ce-9cdfdac4455702563bf0231a0fd433d952b0311b.tar.gz |
Merge branch '35210-disable-nav-animations' into 'master'
Remove transitions on nav link hover
Closes #35210
See merge request !12950
-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 ac9bfda8209..6be321e5732 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; } |