monorail
/
mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix emoji picker button scrolling with textarea content in single-column view (#25304)

This commit is contained in:
Claire 2023-07-27 16:20:33 +02:00 committed by GitHub
parent 317cd26fba
commit bbea052935
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -280,13 +280,12 @@ class ComposeForm extends ImmutablePureComponent {
autoFocus={autoFocus} autoFocus={autoFocus}
lang={this.props.lang} lang={this.props.lang}
> >
<EmojiPickerDropdown onPickEmoji={this.handleEmojiPick} />
<div className='compose-form__modifiers'> <div className='compose-form__modifiers'>
<UploadFormContainer /> <UploadFormContainer />
<PollFormContainer /> <PollFormContainer />
</div> </div>
</AutosuggestTextarea> </AutosuggestTextarea>
<EmojiPickerDropdown onPickEmoji={this.handleEmojiPick} />
<div className='compose-form__buttons-wrapper'> <div className='compose-form__buttons-wrapper'>
<div className='compose-form__buttons'> <div className='compose-form__buttons'>

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

@ -2891,6 +2891,7 @@ $ui-header-height: 55px;
border-radius: 4px; border-radius: 4px;
transition: box-shadow 300ms linear; transition: box-shadow 300ms linear;
min-height: 0; min-height: 0;
position: relative;
&.active { &.active {
transition: none; transition: none;