astrid
/
mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

* Excahnge the order of spoiler-input and unlocked warning

* Fix trailing whitespace
pull/6013/merge
Lynx Kotoura 2017-12-14 02:01:56 +09:00 committed by Eugen Rochko
parent ad941f5a21
commit 8bf4cc72b6
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/javascript/mastodon/features/compose/components/compose_form.js
View File

@ -156,6 +156,8 @@ export default class ComposeForm extends ImmutablePureComponent {
return ( return (
<div className='compose-form'> <div className='compose-form'>
<WarningContainer />
<Collapsable isVisible={this.props.spoiler} fullHeight={50}> <Collapsable isVisible={this.props.spoiler} fullHeight={50}>
<div className='spoiler-input'> <div className='spoiler-input'>
<label> <label>
@ -165,8 +167,6 @@ export default class ComposeForm extends ImmutablePureComponent {
</div> </div>
</Collapsable> </Collapsable>
<WarningContainer />
<ReplyIndicatorContainer /> <ReplyIndicatorContainer />
<div className='compose-form__autosuggest-wrapper'> <div className='compose-form__autosuggest-wrapper'>