From 40fe9256ea57d54ec02262a975aa558d1b55e413 Mon Sep 17 00:00:00 2001
From: Thibaut Girka <thib@sitedethib.com>
Date: Fri, 27 Jul 2018 19:57:24 +0200
Subject: [PATCH] Move CW field just above main textarea
---
.../flavours/glitch/features/composer/index.js | 14 +++++++-------
.../glitch/styles/components/composer.scss | 4 ++--
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/app/javascript/flavours/glitch/features/composer/index.js b/app/javascript/flavours/glitch/features/composer/index.js
index d7f4641f63..2678ffd531 100644
--- a/app/javascript/flavours/glitch/features/composer/index.js
+++ b/app/javascript/flavours/glitch/features/composer/index.js
@@ -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)}
diff --git a/app/javascript/flavours/glitch/styles/components/composer.scss b/app/javascript/flavours/glitch/styles/components/composer.scss
index 0d46297a7b..77ba34672c 100644
--- a/app/javascript/flavours/glitch/styles/components/composer.scss
+++ b/app/javascript/flavours/glitch/styles/components/composer.scss
@@ -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;