ar
/
mastodon
forked from treehouse/mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Full-width tootbox panel to make room for buttons
rebase/4.0.0rc2
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

2
app/javascript/mastodon/features/compose/components/compose_form.js
View File

@ -247,7 +247,6 @@ 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 />
@ -279,7 +278,6 @@ export default class ComposeForm extends ImmutablePureComponent {
</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;
} }