luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-11-21 14:23:04 +00:00
Code Issues Projects Releases Wiki Activity

Fix dismiss button overlapping with text in dismissable banners (#26935)

Browse source
This commit is contained in:
Claire 2023-09-15 19:53:28 +02:00 committed by GitHub
parent e4f5114aaf
commit 2a4fcc51fd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/javascript/mastodon/components/dismissable_banner.tsx
View file

@ -33,8 +33,6 @@ export const DismissableBanner: React.FC<PropsWithChildren<Props>> = ({
return ( return (
<div className='dismissable-banner'> <div className='dismissable-banner'>
<div className='dismissable-banner__message'>{children}</div>
<div className='dismissable-banner__action'> <div className='dismissable-banner__action'>
<IconButton <IconButton
icon='times' icon='times'
@ -42,6 +40,8 @@ export const DismissableBanner: React.FC<PropsWithChildren<Props>> = ({
onClick={handleDismiss} onClick={handleDismiss}
/> />
</div> </div>
<div className='dismissable-banner__message'>{children}</div>
</div> </div>
); );
}; };

4
app/javascript/styles/mastodon/components.scss
View file

@ -8941,9 +8941,7 @@ noscript {
} }
&__action { &__action {
position: absolute; float: right;
inset-inline-end: 0;
top: 0;
padding: 15px 10px; padding: 15px 10px;
.icon-button { .icon-button {

7
app/javascript/styles/mastodon/rtl.scss
View file

@ -58,4 +58,11 @@ body.rtl {
.fa-chevron-right::before { .fa-chevron-right::before {
content: '\F053'; content: '\F053';
} }
.dismissable-banner,
.warning-banner {
&__action {
float: left;
}
}
} }