Move counter into compose-form__buttons-wrapper

Change font and remove shadow Refactor sass codes of compose-form
mastodon · Dec 13, 2017 · 8593ff3 · 8593ff3
1 parent efc7267
commit 8593ff3
Show file tree

Hide file tree

Showing 2 changed files with 241 additions and 261 deletions.
diff --git a/app/javascript/mastodon/features/compose/components/compose_form.js b/app/javascript/mastodon/features/compose/components/compose_form.js
@@ -192,15 +192,17 @@ export default class ComposeForm extends ImmutablePureComponent {
           <UploadFormContainer />
         </div>
 
-        <div className='compose-form__buttons'>
-          <UploadButtonContainer />
-          <PrivacyDropdownContainer />
-          <SensitiveButtonContainer />
-          <SpoilerButtonContainer />
+        <div className='compose-form__buttons-wrapper'>
+          <div className='compose-form__buttons'>
+            <UploadButtonContainer />
+            <PrivacyDropdownContainer />
+            <SensitiveButtonContainer />
+            <SpoilerButtonContainer />
+          </div>
+          <div className='character-counter__wrapper'><CharacterCounter max={500} text={text} /></div>
         </div>
 
         <div className='compose-form__publish'>
-          <div className='character-counter__wrapper'><CharacterCounter max={500} text={text} /></div>
           <div className='compose-form__publish-button-wrapper'><Button text={publishText} onClick={this.handleSubmit} disabled={disabled || this.props.is_uploading || length(text) > 500 || (text.length !== 0 && text.trim().length === 0)} block /></div>
         </div>
       </div>