diff options
| author | Jacob Schatz <jschatz@gitlab.com> | 2017-02-06 14:16:52 +0000 |
|---|---|---|
| committer | Jacob Schatz <jschatz@gitlab.com> | 2017-02-06 14:16:52 +0000 |
| commit | 178626ed6114055d756c7d4a13d5f5eec8fa2a85 (patch) | |
| tree | 24a688258a7299b195a0981d2b75df9a206e8cd3 /app/assets/stylesheets/framework | |
| parent | 0b97dd7ee4d63f9380c476ec31d170d2601f793a (diff) | |
| parent | 22b77948ec8743574bdd74c98888c5c91eb1bb74 (diff) | |
| download | gitlab-ce-178626ed6114055d756c7d4a13d5f5eec8fa2a85.tar.gz | |
Merge branch '27602-fix-avatar-border-flicker-mention-dropdown' into 'master'
Resolves user avatar flickers as you type
Closes #27602
See merge request !8950
Diffstat (limited to 'app/assets/stylesheets/framework')
| -rw-r--r-- | app/assets/stylesheets/framework/animations.scss | 21 | ||||
| -rw-r--r-- | app/assets/stylesheets/framework/markdown_area.scss | 1 |
2 files changed, 22 insertions, 0 deletions
diff --git a/app/assets/stylesheets/framework/animations.scss b/app/assets/stylesheets/framework/animations.scss index 8d38fc78a19..f1ff9faef7f 100644 --- a/app/assets/stylesheets/framework/animations.scss +++ b/app/assets/stylesheets/framework/animations.scss @@ -71,6 +71,27 @@ transition: $unfoldedTransitions; } +@mixin disableAllAnimation { + /*CSS transitions*/ + -o-transition-property: none !important; + -moz-transition-property: none !important; + -ms-transition-property: none !important; + -webkit-transition-property: none !important; + transition-property: none !important; + /*CSS transforms*/ + -o-transform: none !important; + -moz-transform: none !important; + -ms-transform: none !important; + -webkit-transform: none !important; + transform: none !important; + /*CSS animations*/ + -webkit-animation: none !important; + -moz-animation: none !important; + -o-animation: none !important; + -ms-animation: none !important; + animation: none !important; +} + @function unfoldTransition ($transition) { // Default values $property: all; diff --git a/app/assets/stylesheets/framework/markdown_area.scss b/app/assets/stylesheets/framework/markdown_area.scss index 5bff694658c..d4758d90352 100644 --- a/app/assets/stylesheets/framework/markdown_area.scss +++ b/app/assets/stylesheets/framework/markdown_area.scss @@ -159,6 +159,7 @@ .cur { .avatar { border: 1px solid $white-light; + @include disableAllAnimation; } } } |