diff options
| author | David Yip <yipdw@member.fsf.org> | 2017-10-16 15:49:22 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-16 15:49:22 -0500 |
| commit | 313ba202ef33be706ba921688997a6e59f84b473 (patch) | |
| tree | 8eb4a8b98ad7e74001e01fa14436e10b001ce17d /app/javascript | |
| parent | 7c44ad63550ccf3cb7532440f79196b20dc24c5d (diff) | |
| parent | 3d7de06db4d4961e2e458b1b7d53961e9eb98a19 (diff) | |
Merge pull request #182 from glitch-soc/wide-tootbox-panel
Full-width tootbox panel to make room for buttons
Diffstat (limited to 'app/javascript')
| -rw-r--r-- | app/javascript/mastodon/features/compose/components/compose_form.js | 56 | ||||
| -rw-r--r-- | app/javascript/styles/components.scss | 2 |
2 files changed, 28 insertions, 30 deletions
diff --git a/app/javascript/mastodon/features/compose/components/compose_form.js b/app/javascript/mastodon/features/compose/components/compose_form.js index 5b06cef7c..a443f2980 100644 --- a/app/javascript/mastodon/features/compose/components/compose_form.js +++ b/app/javascript/mastodon/features/compose/components/compose_form.js @@ -247,36 +247,34 @@ export default class ComposeForm extends ImmutablePureComponent { <UploadFormContainer /> </div> - <div className='compose-form__buttons-wrapper'> - <div className='compose-form__buttons'> - <UploadButtonContainer /> - <DoodleButtonContainer /> - <PrivacyDropdownContainer /> - <ComposeAdvancedOptionsContainer /> - <SensitiveButtonContainer /> - <SpoilerButtonContainer /> - </div> + <div className='compose-form__buttons'> + <UploadButtonContainer /> + <DoodleButtonContainer /> + <PrivacyDropdownContainer /> + <ComposeAdvancedOptionsContainer /> + <SensitiveButtonContainer /> + <SpoilerButtonContainer /> + </div> - <div className='compose-form__publish'> - <div className='character-counter__wrapper'><CharacterCounter max={500} text={text} /></div> - <div className='compose-form__publish-button-wrapper'> - { - showSideArm ? - <Button - className='compose-form__publish__side-arm' - text={publishText2} - onClick={this.handleSubmit2} - disabled={submitDisabled} - /> : '' - } - <Button - className='compose-form__publish__primary' - text={publishText} - onClick={this.handleSubmit} - disabled={submitDisabled} - block - /> - </div> + <div className='compose-form__publish'> + <div className='character-counter__wrapper'><CharacterCounter max={500} text={text} /></div> + <div className='compose-form__publish-button-wrapper'> + { + showSideArm ? + <Button + className='compose-form__publish__side-arm' + text={publishText2} + onClick={this.handleSubmit2} + disabled={submitDisabled} + /> : '' + } + <Button + className='compose-form__publish__primary' + text={publishText} + onClick={this.handleSubmit} + disabled={submitDisabled} + block + /> </div> </div> </div> diff --git a/app/javascript/styles/components.scss b/app/javascript/styles/components.scss index 7ef3dcc43..43d484e6e 100644 --- a/app/javascript/styles/components.scss +++ b/app/javascript/styles/components.scss @@ -302,7 +302,6 @@ font-family: inherit; font-size: 14px; background: $simple-background-color; - border-radius: 0 0 4px; } .compose-form__buttons-wrapper { @@ -452,6 +451,7 @@ .compose-form__publish { display: flex; + justify-content: flex-end; min-width: 0; } |