]> cat aescling's git repositories - mastodon.git/commitdiff
Excahnge the order of spoiler-input and unlocked warning (#6015)
authorLynx Kotoura <admin@sanin.link>
Wed, 13 Dec 2017 17:01:56 +0000 (02:01 +0900)
committerEugen Rochko <eugen@zeonfederated.com>
Wed, 13 Dec 2017 17:01:56 +0000 (18:01 +0100)
* Excahnge the order of spoiler-input and unlocked warning

* Fix trailing whitespace

app/javascript/mastodon/features/compose/components/compose_form.js

index 9471e5275e6efe018f9b98352c6bb8d6049bc225..a876c5197e7221011b448e03f8aeea34a570fa46 100644 (file)
@@ -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'>