mirrors
/
mastodon
mirror of https://github.com/mastodon/mastodon.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Change margins

Eugen Rochko 2024-06-14 17:14:46 +02:00 committed by Renaud Chaput
parent 03f4f03244
commit 08ec438496
No known key found for this signature in database
GPG Key ID: BCFC859D49B46990
3 changed files with 29 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/javascript/mastodon/features/notifications_v2/components/notification_poll.tsx
View File

@ -9,7 +9,7 @@ import { NotificationWithStatus } from './notification_with_status';
const labelRendererOther = () => ( const labelRendererOther = () => (
<FormattedMessage <FormattedMessage
id='notification.poll' id='notification.poll'
defaultMessage='A poll you have voted in has ended' defaultMessage='A poll you voted in has ended'
/> />
); );

2
app/javascript/mastodon/locales/en.json
View File

@ -490,7 +490,7 @@
"notification.moderation_warning.action_silence": "Your account has been limited.", "notification.moderation_warning.action_silence": "Your account has been limited.",
"notification.moderation_warning.action_suspend": "Your account has been suspended.", "notification.moderation_warning.action_suspend": "Your account has been suspended.",
"notification.own_poll": "Your poll has ended", "notification.own_poll": "Your poll has ended",
"notification.poll": "A poll you have voted in has ended", "notification.poll": "A poll you voted in has ended",
"notification.reblog": "{name} boosted your post", "notification.reblog": "{name} boosted your post",
"notification.relationships_severance_event": "Lost connections with {name}", "notification.relationships_severance_event": "Lost connections with {name}",
"notification.relationships_severance_event.account_suspension": "An admin from {from} has suspended {target}, which means you can no longer receive updates from them or interact with them.", "notification.relationships_severance_event.account_suspension": "An admin from {from} has suspended {target}, which means you can no longer receive updates from them or interact with them.",

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

@ -10184,7 +10184,7 @@ noscript {
align-items: center; align-items: center;
border: 1px solid var(--background-border-color); border: 1px solid var(--background-border-color);
border-top: 0; border-top: 0;
padding: 16px; padding: 16px 24px;
gap: 8px; gap: 8px;
color: $darker-text-color; color: $darker-text-color;
text-decoration: none; text-decoration: none;
@ -10338,7 +10338,7 @@ noscript {
display: flex; display: flex;
align-items: flex-start; align-items: flex-start;
gap: 8px; gap: 8px;
padding: 16px; padding: 16px 24px;
border-bottom: 1px solid var(--background-border-color); border-bottom: 1px solid var(--background-border-color);
&__icon { &__icon {
@ -10466,7 +10466,7 @@ noscript {
} }
.notification-ungrouped { .notification-ungrouped {
padding: 16px; padding: 16px 24px;
border-bottom: 1px solid var(--background-border-color); border-bottom: 1px solid var(--background-border-color);
&__header { &__header {
@ -10513,6 +10513,30 @@ noscript {
} }
} }
$icon-margin: 48px; // 40px avatar + 8px gap
.status__content,
.status__action-bar,
.media-gallery,
.video-player,
.audio-player,
.attachment-list,
.picture-in-picture-placeholder,
.more-from-author,
.status-card,
.hashtag-bar {
margin-inline-start: $icon-margin;
width: calc(100% - $icon-margin);
}
.more-from-author {
width: calc(100% - $icon-margin + 2px);
}
.status__content__read-more-button {
margin-inline-start: $icon-margin;
}
.notification__report { .notification__report {
border: 0; border: 0;
padding: 0; padding: 0;