diff options
author | ThibG <thib@sitedethib.com> | 2018-06-24 15:27:51 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-06-24 15:27:51 +0200 |
commit | c18d55e8c25d47a81f99f5ea018d58eecb206a79 (patch) | |
tree | fe8d33304593499d6c9f87e59a23a51d4d45f9b0 /app/javascript | |
parent | f364a27922b19efb312959a562a7541cf9d89e97 (diff) | |
parent | 4b0f27ba7822befed76f8368b472c6ade6977cb2 (diff) |
Merge pull request #553 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/javascript')
-rw-r--r-- | app/javascript/styles/mastodon/components.scss | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss index 147cc653b..6905eaa1e 100644 --- a/app/javascript/styles/mastodon/components.scss +++ b/app/javascript/styles/mastodon/components.scss @@ -302,12 +302,10 @@ height: 0; transform-origin: bottom; opacity: 0.0; - transition: all 0.4s ease; &.spoiler-input--visible { height: 47px; opacity: 1.0; - transition: all 0.4s ease; } } @@ -568,6 +566,10 @@ } } +.no-reduce-motion .spoiler-input { + transition: height 0.4s ease, opacity 0.4s ease; +} + .emojione { font-size: inherit; vertical-align: middle; |