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

Move CW field just above main textarea

This commit is contained in:
Thibaut Girka 2018-07-27 19:57:24 +02:00 committed by ThibG
parent 358e3a4c32
commit 28a59e4e80
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/javascript/flavours/glitch/features/composer/index.js
View File

@ -318,13 +318,6 @@ class Composer extends React.Component {
return ( return (
<div className='composer'> <div className='composer'>
<ComposerSpoiler
hidden={!spoiler}
intl={intl}
onChange={handleChangeSpoiler}
onSubmit={handleSubmit}
text={spoilerText}
/>
{privacy === 'direct' ? <ComposerDirectWarning /> : null} {privacy === 'direct' ? <ComposerDirectWarning /> : null}
{privacy === 'private' && amUnlocked ? <ComposerWarning /> : null} {privacy === 'private' && amUnlocked ? <ComposerWarning /> : null}
{privacy !== 'public' && APPROX_HASHTAG_RE.test(text) ? <ComposerHashtagWarning /> : null} {privacy !== 'public' && APPROX_HASHTAG_RE.test(text) ? <ComposerHashtagWarning /> : null}
@ -335,6 +328,13 @@ class Composer extends React.Component {
onCancel={onCancelReply} onCancel={onCancelReply}
/> />
)} )}
<ComposerSpoiler
hidden={!spoiler}
intl={intl}
onChange={handleChangeSpoiler}
onSubmit={handleSubmit}
text={spoilerText}
/>
<ComposerTextarea <ComposerTextarea
advancedOptions={advancedOptions} advancedOptions={advancedOptions}
autoFocus={!showSearch && !isMobile(window.innerWidth, layout)} autoFocus={!showSearch && !isMobile(window.innerWidth, layout)}

4
app/javascript/flavours/glitch/styles/components/composer.scss
View File

@ -58,8 +58,8 @@
} }
.composer--reply { .composer--reply {
margin: 0 0 -2px; margin: 0 0 10px;
border-radius: 4px 4px 0 0; border-radius: 4px;
padding: 10px; padding: 10px;
background: $ui-primary-color; background: $ui-primary-color;