diff options
author | Eugen Rochko <eugen@zeonfederated.com> | 2017-10-07 19:02:30 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-10-07 19:02:30 +0200 |
commit | d2dee6ea431f52ab90c568b21b25169d5129c7a6 (patch) | |
tree | bf825270d09dec66084a521bcf2bae630f4377a7 /app/javascript/styles | |
parent | 967e70663fc694836e3b99595bea74485557cbd1 (diff) |
Fix custom emoji in emoji picker, persist skin tone (#5258)
Diffstat (limited to 'app/javascript/styles')
-rw-r--r-- | app/javascript/styles/components.scss | 31 |
1 files changed, 24 insertions, 7 deletions
diff --git a/app/javascript/styles/components.scss b/app/javascript/styles/components.scss index aecc98e76..6c64528d6 100644 --- a/app/javascript/styles/components.scss +++ b/app/javascript/styles/components.scss @@ -2653,19 +2653,36 @@ button.icon-button.active i.fa-retweet { flex-direction: column; } -@keyframes pulse { - 0% { - opacity: 1; +@keyframes heartbeat { + from { + transform: scale(1); + transform-origin: center center; + animation-timing-function: ease-out; } - 100% { - opacity: 0.5; + 10% { + transform: scale(0.91); + animation-timing-function: ease-in; + } + + 17% { + transform: scale(0.98); + animation-timing-function: ease-out; + } + + 33% { + transform: scale(0.87); + animation-timing-function: ease-in; + } + + 45% { + transform: scale(1); + animation-timing-function: ease-out; } } .pulse-loading { - animation: pulse 1s ease-in-out infinite; - animation-direction: alternate; + animation: heartbeat 1.5s ease-in-out infinite both; } .emoji-picker-dropdown__menu { |