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

[Glitch] Fix emoji picker button scrolling with textarea content in single-column view (#2501) 

Port bbea052935 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
This commit is contained in:
Claire 2023-12-04 13:30:27 +01:00 committed by GitHub
parent a46b6af1d6
commit 9fcf5d4192
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/javascript/flavours/glitch/features/compose/components/compose_form.jsx
View File

@ -362,13 +362,13 @@ class ComposeForm extends ImmutablePureComponent {
autoFocus={!showSearch && !isMobile(window.innerWidth, layout)} autoFocus={!showSearch && !isMobile(window.innerWidth, layout)}
lang={this.props.lang} lang={this.props.lang}
> >
<EmojiPickerDropdown onPickEmoji={handleEmojiPick} />
<TextareaIcons advancedOptions={advancedOptions} /> <TextareaIcons advancedOptions={advancedOptions} />
<div className='compose-form__modifiers'> <div className='compose-form__modifiers'>
<UploadFormContainer /> <UploadFormContainer />
<PollFormContainer /> <PollFormContainer />
</div> </div>
</AutosuggestTextarea> </AutosuggestTextarea>
<EmojiPickerDropdown onPickEmoji={handleEmojiPick} />
<div className='compose-form__buttons-wrapper'> <div className='compose-form__buttons-wrapper'>
<OptionsContainer <OptionsContainer

1
app/javascript/flavours/glitch/styles/components/columns.scss
View File

@ -1240,6 +1240,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;