Leatherface/mastodon
0
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2026-03-29 11:11:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit '8e00f7cc8fab9b447f80a27a972eef78186633ad' into glitch-soc/merge-upstream

Browse Source
This commit is contained in:
Claire
2026-03-27 18:15:50 +01:00
parent d79af17e8c 8e00f7cc8f
commit 30bb39fe54
86 changed files with 1142 additions and 558 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2011,7 +2011,15 @@ body > [data-popper-placement] {
}
.account {
padding: 16px;
--account-outer-spacing: 16px;
--account-name-color: var(--color-text-primary);
--account-name-size: 14px;
--account-handle-color: var(--color-text-secondary);
--account-handle-size: 14px;
--account-bio-color: var(--color-text-secondary);
--account-bio-size: 14px;
padding: var(--account-outer-spacing);
// Using :where keeps specificity low, allowing for existing
// .account overrides to still apply
@@ -2024,10 +2032,10 @@ body > [data-popper-placement] {
display: flex;
align-items: center;
gap: 10px;
color: var(--color-text-secondary);
color: var(--account-handle-color);
overflow: hidden;
text-decoration: none;
font-size: 14px;
font-size: var(--account-handle-size);
.display-name {
margin-bottom: 4px;
@@ -2035,7 +2043,8 @@ body > [data-popper-placement] {
.display-name strong {
display: inline;
color: var(--color-text-primary);
font-size: var(--account-name-size);
color: var(--account-name-color);
}
}
@@ -2173,7 +2182,7 @@ body > [data-popper-placement] {
}
&__note {
font-size: 14px;
font-size: var(--account-bio-size);
font-weight: 400;
overflow: hidden;
text-overflow: ellipsis;
@@ -2182,7 +2191,7 @@ body > [data-popper-placement] {
-webkit-line-clamp: 1;
-webkit-box-orient: vertical;
margin-top: 10px;
color: var(--color-text-secondary);
color: var(--account-bio-color);
&--missing {
color: var(--color-text-tertiary);
@@ -10400,9 +10409,13 @@ noscript {
padding: 0 4px;
&:hover,
&:focus,
&:active {
background: var(--color-bg-brand-softest);
background: rgb(from var(--color-text-inverted) r g b / 10%);
}
&:focus-visible {
outline: 2px solid var(--color-text-brand-on-inverted);
outline-offset: 2px;
}
}

4
app/javascript/styles/mastodon/theme/_dark.scss
View File

@@ -18,9 +18,9 @@
--color-text-brand-on-inverted: var(--color-indigo-600); // legacy
--color-text-error: var(--color-red-300);
--color-text-on-error-base: var(--color-white);
--color-text-warning: var(--color-yellow-400); // legacy
--color-text-warning: var(--color-yellow-400);
--color-text-on-warning-base: var(--color-white);
--color-text-success: var(--color-green-400); // legacy
--color-text-success: var(--color-green-400);
--color-text-on-success-base: var(--color-white);
--color-text-disabled: var(--color-grey-600); // legacy
--color-text-on-disabled: var(--color-grey-400); // legacy

4
app/javascript/styles/mastodon/theme/_light.scss
View File

@@ -18,9 +18,9 @@
--color-text-brand-on-inverted: var(--color-indigo-400); // legacy
--color-text-error: var(--color-red-800);
--color-text-on-error-base: var(--color-white);
--color-text-warning: var(--color-yellow-600); // legacy
--color-text-warning: var(--color-yellow-700);
--color-text-on-warning-base: var(--color-white);
--color-text-success: var(--color-green-600); // legacy
--color-text-success: var(--color-green-700);
--color-text-on-success-base: var(--color-white);
--color-text-disabled: var(--color-grey-300); // legacy
--color-text-on-disabled: var(--color-grey-200); // legacy