Leatherface/mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2025-12-28 22:56:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit '0cea7a623be470c51d7a162265f44f5a3e149275' into glitch-soc/merge-upstream

Browse Source
This commit is contained in:
Claire
2024-04-06 21:48:35 +02:00
parent a844a6a577 0cea7a623b
commit 0e76b919b5
63 changed files with 614 additions and 367 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2165,6 +2165,44 @@ a.account__display-name {
}
}
.notification__relationships-severance-event {
display: flex;
gap: 16px;
color: $secondary-text-color;
text-decoration: none;
align-items: flex-start;
padding: 16px 32px;
border-bottom: 1px solid var(--background-border-color);
&:hover {
color: $primary-text-color;
}
.icon {
padding: 2px;
color: $highlight-text-color;
}
&__content {
display: flex;
flex-direction: column;
align-items: flex-start;
gap: 8px;
flex-grow: 1;
font-size: 16px;
line-height: 24px;
strong {
font-weight: 700;
}
.link-button {
font-size: inherit;
line-height: inherit;
}
}
}
.notification__message {
padding: 16px;
padding-bottom: 0;
@@ -9734,18 +9772,24 @@ noscript {
margin-top: 16px;
display: flex;
flex-wrap: wrap;
font-size: 14px;
line-height: 18px;
gap: 4px;
font-size: 12px;
line-height: 16px;
gap: 6px;
color: $darker-text-color;
a {
display: inline-flex;
color: inherit;
text-decoration: none;
padding: 4px 12px;
background: $ui-base-color;
border-radius: 4px;
font-weight: 500;
&:hover span {
text-decoration: underline;
&:hover,
&:focus,
&:active {
background: lighten($ui-base-color, 4%);
}
}
@@ -9961,10 +10005,10 @@ noscript {
.filtered-notifications-banner {
display: flex;
align-items: center;
background: $ui-base-color;
border-bottom: 1px solid lighten($ui-base-color, 8%);
padding: 15px;
gap: 15px;
border: 1px solid var(--background-border-color);
border-top: 0;
padding: 24px 32px;
gap: 16px;
color: $darker-text-color;
text-decoration: none;
@@ -9972,15 +10016,12 @@ noscript {
&:active,
&:focus {
color: $secondary-text-color;
.filtered-notifications-banner__badge {
background: $secondary-text-color;
}
}
.icon {
width: 24px;
height: 24px;
padding: 2px;
}
&__text {
@@ -9996,13 +10037,24 @@ noscript {
}
&__badge {
background: $darker-text-color;
color: $ui-base-color;
border-radius: 100px;
padding: 2px 8px;
display: flex;
align-items: center;
border-radius: 999px;
background: var(--background-border-color);
color: $darker-text-color;
padding: 4px;
padding-inline-end: 8px;
gap: 6px;
font-weight: 500;
font-size: 11px;
line-height: 16px;
&__badge {
background: $ui-button-background-color;
color: $white;
border-radius: 100px;
padding: 2px 8px;
}
}
}
@@ -10011,7 +10063,7 @@ noscript {
align-items: center;
gap: 16px;
padding: 15px;
border-bottom: 1px solid lighten($ui-base-color, 8%);
border-bottom: 1px solid var(--background-border-color);
&__link {
display: flex;
@@ -10059,7 +10111,7 @@ noscript {
.icon-button {
border-radius: 4px;
border: 1px solid lighten($ui-base-color, 8%);
border: 1px solid var(--background-border-color);
padding: 5px;
}
}