luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-12-25 14:46:46 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #182 from glitch-soc/wide-tootbox-panel

Browse source 
Full-width tootbox panel to make room for buttons
This commit is contained in:
David Yip 2017-10-16 15:49:22 -05:00 committed by GitHub
parent 7c44ad6355 3d7de06db4
commit 313ba202ef
2 changed files with 28 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

56
app/javascript/mastodon/features/compose/components/compose_form.js
View file

@ -247,36 +247,34 @@ export default class ComposeForm extends ImmutablePureComponent {
<UploadFormContainer /> <UploadFormContainer />
</div> </div>
<div className='compose-form__buttons-wrapper'> <div className='compose-form__buttons'>
<div className='compose-form__buttons'> <UploadButtonContainer />
<UploadButtonContainer /> <DoodleButtonContainer />
<DoodleButtonContainer /> <PrivacyDropdownContainer />
<PrivacyDropdownContainer /> <ComposeAdvancedOptionsContainer />
<ComposeAdvancedOptionsContainer /> <SensitiveButtonContainer />
<SensitiveButtonContainer /> <SpoilerButtonContainer />
<SpoilerButtonContainer /> </div>
</div>
<div className='compose-form__publish'> <div className='compose-form__publish'>
<div className='character-counter__wrapper'><CharacterCounter max={500} text={text} /></div> <div className='character-counter__wrapper'><CharacterCounter max={500} text={text} /></div>
<div className='compose-form__publish-button-wrapper'> <div className='compose-form__publish-button-wrapper'>
{ {
showSideArm ? showSideArm ?
<Button <Button
className='compose-form__publish__side-arm' className='compose-form__publish__side-arm'
text={publishText2} text={publishText2}
onClick={this.handleSubmit2} onClick={this.handleSubmit2}
disabled={submitDisabled} disabled={submitDisabled}
/> : '' /> : ''
} }
<Button <Button
className='compose-form__publish__primary' className='compose-form__publish__primary'
text={publishText} text={publishText}
onClick={this.handleSubmit} onClick={this.handleSubmit}
disabled={submitDisabled} disabled={submitDisabled}
block block
/> />
</div>
</div> </div>
</div> </div>
</div> </div>

2
app/javascript/styles/components.scss
View file

@ -302,7 +302,6 @@
font-family: inherit; font-family: inherit;
font-size: 14px; font-size: 14px;
background: $simple-background-color; background: $simple-background-color;
border-radius: 0 0 4px;
} }
.compose-form__buttons-wrapper { .compose-form__buttons-wrapper {
@ -452,6 +451,7 @@
.compose-form__publish { .compose-form__publish {
display: flex; display: flex;
justify-content: flex-end;
min-width: 0; min-width: 0;
} }