about summary refs log tree commit diff
path: root/app
diff options
context:
space:
mode:
authorMélanie Chauvel (ariasuni) <perso@hack-libre.org>2018-06-21 23:05:01 +0200
committerEugen Rochko <eugen@zeonfederated.com>2018-06-21 23:05:01 +0200
commitf0f8b242c4ccd3603a60ba5decf7dc225000a017 (patch)
tree41d6c14892ce46bce03746c0e0e803a2d686a0a2 /app
parent7f59206944193591d7aef5cbd73edc7f5303add7 (diff)
Fix CW field still having animation in when reduce motion is enabled (#7872)
Diffstat (limited to 'app')
-rw-r--r--app/javascript/styles/mastodon/components.scss6
1 files changed, 4 insertions, 2 deletions
diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss
index 28daac6a3..c16cf3437 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;