forked from treehouse/mastodon
Move CW field just above main textarea
parent
358e3a4c32
commit
28a59e4e80
|
@ -318,13 +318,6 @@ class Composer extends React.Component {
|
|||
|
||||
return (
|
||||
<div className='composer'>
|
||||
<ComposerSpoiler
|
||||
hidden={!spoiler}
|
||||
intl={intl}
|
||||
onChange={handleChangeSpoiler}
|
||||
onSubmit={handleSubmit}
|
||||
text={spoilerText}
|
||||
/>
|
||||
{privacy === 'direct' ? <ComposerDirectWarning /> : null}
|
||||
{privacy === 'private' && amUnlocked ? <ComposerWarning /> : null}
|
||||
{privacy !== 'public' && APPROX_HASHTAG_RE.test(text) ? <ComposerHashtagWarning /> : null}
|
||||
|
@ -335,6 +328,13 @@ class Composer extends React.Component {
|
|||
onCancel={onCancelReply}
|
||||
/>
|
||||
)}
|
||||
<ComposerSpoiler
|
||||
hidden={!spoiler}
|
||||
intl={intl}
|
||||
onChange={handleChangeSpoiler}
|
||||
onSubmit={handleSubmit}
|
||||
text={spoilerText}
|
||||
/>
|
||||
<ComposerTextarea
|
||||
advancedOptions={advancedOptions}
|
||||
autoFocus={!showSearch && !isMobile(window.innerWidth, layout)}
|
||||
|
|
|
@ -58,8 +58,8 @@
|
|||
}
|
||||
|
||||
.composer--reply {
|
||||
margin: 0 0 -2px;
|
||||
border-radius: 4px 4px 0 0;
|
||||
margin: 0 0 10px;
|
||||
border-radius: 4px;
|
||||
padding: 10px;
|
||||
background: $ui-primary-color;
|
||||
|
||||
|
|
Loading…
Reference in New Issue