treehouse
/
mastodon
21
8
Fork 5
Code Issues 32 Pull Requests Projects 1 Releases Wiki Activity

double-decker tootbox

remotes/1727458204337373841/tmp_refs/heads/signup-info-prompt
Ondřej Hruška 2017-10-16 22:10:14 +02:00
parent 6cd5b3bbe5
commit 26f08f0791
No known key found for this signature in database
GPG Key ID: 2C5FD5035250423D
2 changed files with 29 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>

3
app/javascript/styles/components.scss
View File

@ -302,7 +302,7 @@
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; //border-radius: 0 0 4px;
} }
.compose-form__buttons-wrapper { .compose-form__buttons-wrapper {
@ -452,6 +452,7 @@
.compose-form__publish { .compose-form__publish {
display: flex; display: flex;
justify-content: flex-end;
min-width: 0; min-width: 0;
} }