gnh1201/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2025-09-05 17:31:12 +00:00
Code Issues Actions 34 Packages Projects Releases Wiki Activity

Move language and visibility buttons above CW field (#35824)

Browse Source
This commit is contained in:
Echo 2025-08-19 17:29:10 +02:00 committed by GitHub
parent 831a24ae15
commit f16f8b51b8
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/javascript/mastodon/features/compose/components/compose_form.jsx
View File

@ -259,6 +259,11 @@ class ComposeForm extends ImmutablePureComponent {
<div className={classNames('compose-form__highlightable', { active: highlighted })} ref={this.setRef}> <div className={classNames('compose-form__highlightable', { active: highlighted })} ref={this.setRef}>
<EditIndicator /> <EditIndicator />
<div className='compose-form__dropdowns'>
<PrivacyDropdownContainer disabled={this.props.isEditing} />
<LanguageDropdown />
</div>
{this.props.spoiler && ( {this.props.spoiler && (
<div className='spoiler-input'> <div className='spoiler-input'>
<div className='spoiler-input__border' /> <div className='spoiler-input__border' />
@ -285,11 +290,6 @@ class ComposeForm extends ImmutablePureComponent {
</div> </div>
)} )}
<div className='compose-form__dropdowns'>
<PrivacyDropdownContainer disabled={this.props.isEditing} />
<LanguageDropdown />
</div>
<AutosuggestTextarea <AutosuggestTextarea
ref={this.textareaRef} ref={this.textareaRef}
placeholder={intl.formatMessage(messages.placeholder)} placeholder={intl.formatMessage(messages.placeholder)}

11
app/javascript/styles/mastodon/components.scss
View File

@ -656,19 +656,12 @@ body > [data-popper-placement] {
background: url('@/images/warning-stripes.svg') repeat-y; background: url('@/images/warning-stripes.svg') repeat-y;
width: 5px; width: 5px;
flex: 0 0 auto; flex: 0 0 auto;
&:first-child {
border-start-start-radius: 4px;
}
&:last-child {
border-start-end-radius: 4px;
}
} }
.autosuggest-input { .autosuggest-input {
flex: 1 1 auto; flex: 1 1 auto;
border-bottom: 1px solid var(--background-border-color); border: 1px solid var(--background-border-color);
border-width: 1px 0;
} }
} }