diff options
| author | Lynx Kotoura <admin@sanin.link> | 2017-12-14 02:01:56 +0900 |
|---|---|---|
| committer | Eugen Rochko <eugen@zeonfederated.com> | 2017-12-13 18:01:56 +0100 |
| commit | 8bf4cc72b6d1bdd4fe3f2a366946533376053ccc (patch) | |
| tree | 027af3921a374f50b7d303021d40d0a073885c0b /app | |
| parent | ad941f5a21ab154d82cedc94234bdb9751f1395d (diff) | |
Excahnge the order of spoiler-input and unlocked warning (#6015)
* Excahnge the order of spoiler-input and unlocked warning * Fix trailing whitespace
Diffstat (limited to 'app')
| -rw-r--r-- | app/javascript/mastodon/features/compose/components/compose_form.js | 4 |
1 files 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 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'> |