Merge branch 'master' into glitch-soc/merge-upstream

2018-06-24 14:32:22 +02:00
parent 03cfe366fd 50a2854f92
commit 4b0f27ba78
6 changed files with 53 additions and 10 deletions
--- 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;