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

Fix dual toot button wrong behavior after compose re-design

signup-info-prompt
Ondřej Hruška 2017-10-16 23:32:13 +02:00
parent 7364b26e4b
commit 4421f6598f
No known key found for this signature in database
GPG Key ID: 2C5FD5035250423D
2 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -162,7 +162,6 @@ export default class ComposeForm extends ImmutablePureComponent {
const text = [this.props.spoiler_text, countableText(this.props.text), maybeEye].join(''); const text = [this.props.spoiler_text, countableText(this.props.text), maybeEye].join('');
const secondaryVisibility = this.props.settings.get('side_arm'); const secondaryVisibility = this.props.settings.get('side_arm');
const isWideView = this.props.settings.get('stretch');
let showSideArm = secondaryVisibility !== 'none'; let showSideArm = secondaryVisibility !== 'none';
let publishText = ''; let publishText = '';
@ -182,14 +181,9 @@ export default class ComposeForm extends ImmutablePureComponent {
{ {
<i <i
className={`fa fa-${privacyIcons[this.props.privacy]}`} className={`fa fa-${privacyIcons[this.props.privacy]}`}
style={{ style={{ paddingRight: '5px' }}
paddingRight: (filesAttached || !isWideView) ? '0' : '5px',
}}
/> />
}{ }{intl.formatMessage(messages.publish)}
(filesAttached || !isWideView) ? '' :
intl.formatMessage(messages.publish)
}
</span> </span>
); );
@ -273,7 +267,6 @@ export default class ComposeForm extends ImmutablePureComponent {
text={publishText} text={publishText}
onClick={this.handleSubmit} onClick={this.handleSubmit}
disabled={submitDisabled} disabled={submitDisabled}
block
/> />
</div> </div>
</div> </div>

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

@ -468,7 +468,7 @@
.compose-form__publish__side-arm { .compose-form__publish__side-arm {
padding: 0 !important; padding: 0 !important;
width: 4em; width: 36px;
text-align: center; text-align: center;
margin-right: 2px; margin-right: 2px;
} }