From: Lynx Kotoura <admin@sanin.link>
Date: Wed, 13 Dec 2017 17:01:56 +0000 (+0900)
Subject: Excahnge the order of spoiler-input and unlocked warning (#6015)
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=8bf4cc72b6d1bdd4fe3f2a366946533376053ccc;p=mastodon.git

Excahnge the order of spoiler-input and unlocked warning (#6015)

* Excahnge the order of spoiler-input and unlocked warning

* Fix trailing whitespace
---

diff --git a/app/javascript/mastodon/features/compose/components/compose_form.js b/app/javascript/mastodon/features/compose/components/compose_form.js
index 9471e5275..a876c5197 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'>