diff options
| author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-02-13 14:44:44 +0000 |
|---|---|---|
| committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-02-13 14:44:44 +0000 |
| commit | f2443381ba1fd89062dd1f40d952a0a398afb6ec (patch) | |
| tree | a1d12847faa693743b759de960bc727a335897d9 /app/assets/stylesheets | |
| parent | 027a4bd274d7060e35cfe225765c917d7de25b31 (diff) | |
| parent | 2a03f35461eeba8545a775b04751e6c7b866f8c0 (diff) | |
| download | gitlab-ce-f2443381ba1fd89062dd1f40d952a0a398afb6ec.tar.gz | |
Merge branch '28034-icon-in-issue-search-dropdown-still-animates' into 'master'
Resolve "Icon in issue search dropdown still animates"
Closes #28034
See merge request !9156
Diffstat (limited to 'app/assets/stylesheets')
| -rw-r--r-- | app/assets/stylesheets/framework/animations.scss | 3 | ||||
| -rw-r--r-- | app/assets/stylesheets/framework/avatar.scss | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/app/assets/stylesheets/framework/animations.scss b/app/assets/stylesheets/framework/animations.scss index 0a26b4c6a8c..0ca5a9343f7 100644 --- a/app/assets/stylesheets/framework/animations.scss +++ b/app/assets/stylesheets/framework/animations.scss @@ -128,8 +128,7 @@ .note-action-button .link-highlight, .toolbar-btn, -.dropdown-toggle-caret, -.fa:not(.fa-bell) { +.dropdown-toggle-caret { @include transition(color); } diff --git a/app/assets/stylesheets/framework/avatar.scss b/app/assets/stylesheets/framework/avatar.scss index 1d59700543c..3f5b78ed445 100644 --- a/app/assets/stylesheets/framework/avatar.scss +++ b/app/assets/stylesheets/framework/avatar.scss @@ -28,6 +28,8 @@ .avatar { @extend .avatar-circle; + @include transition-property(none); + width: 40px; height: 40px; padding: 0; |