From 8bf4cc72b6d1bdd4fe3f2a366946533376053ccc Mon Sep 17 00:00:00 2001
From: Lynx Kotoura <admin@sanin.link>
Date: Thu, 14 Dec 2017 02:01:56 +0900
Subject: [PATCH] Excahnge the order of spoiler-input and unlocked warning
(#6015)
* Excahnge the order of spoiler-input and unlocked warning
* Fix trailing whitespace
---
.../mastodon/features/compose/components/compose_form.js | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/app/javascript/mastodon/features/compose/components/compose_form.js b/app/javascript/mastodon/features/compose/components/compose_form.js
index 9471e5275e..a876c5197e 100644
--- a/app/javascript/mastodon/features/compose/components/compose_form.js
+++ b/app/javascript/mastodon/features/compose/components/compose_form.js
@@ -156,6 +156,8 @@ export default class ComposeForm extends ImmutablePureComponent {
return (
<div className='compose-form'>
+ <WarningContainer />
+
<Collapsable isVisible={this.props.spoiler} fullHeight={50}>
<div className='spoiler-input'>
<label>
@@ -165,8 +167,6 @@ export default class ComposeForm extends ImmutablePureComponent {
</div>
</Collapsable>
- <WarningContainer />
-
<ReplyIndicatorContainer />
<div className='compose-form__autosuggest-wrapper'>
--
GitLab