diff options
| author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-02-13 14:44:44 +0000 |
|---|---|---|
| committer | Regis <boudinot.regis@yahoo.com> | 2017-02-14 15:37:17 -0700 |
| commit | 20f9a1c5145f7e7565168e0d69fc2eabf171de74 (patch) | |
| tree | e7e361aa3418a1edc313b6b52d44fa62e104ade7 | |
| parent | 26f9b82311e428d36cacd9edb3119e5d4c1bd184 (diff) | |
| download | gitlab-ce-20f9a1c5145f7e7565168e0d69fc2eabf171de74.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
| -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; |