about summary refs log tree commit diff
path: root/app/javascript/styles
diff options
context:
space:
mode:
authorMélanie Chauvel (ariasuni) <perso@hack-libre.org>2018-05-31 15:16:31 +0200
committerEugen Rochko <eugen@zeonfederated.com>2018-05-31 15:16:31 +0200
commit691107263c5e05973f9af9e1937abbc27430f54e (patch)
tree328ec7f9f672caec882b504ed7e8fc3418fc5244 /app/javascript/styles
parent648a22637cf700f5475af2fce1d29f1607b7b5e1 (diff)
Put the CW field between the toot we are replying to and the toot field (#7508)
* Remove Collapsable and use CSS instead

* Put the CW field between the toot we are replying to and the toot field

* Use same spacing between all fields in the composing column
Diffstat (limited to 'app/javascript/styles')
-rw-r--r--app/javascript/styles/mastodon/components.scss17
1 files changed, 15 insertions, 2 deletions
diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss
index c13dc1a05..124998a48 100644
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@@ -298,6 +298,19 @@
     position: relative;
   }
 
+  .spoiler-input {
+    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;
+    }
+  }
+
   .autosuggest-textarea__textarea,
   .spoiler-input__input {
     display: block;
@@ -569,9 +582,9 @@
 }
 
 .reply-indicator {
-  border-radius: 4px 4px 0 0;
+  border-radius: 4px;
   position: relative;
-  bottom: -2px;
+  bottom: 10px;
   background: $ui-primary-color;
   padding: 10px;
 }