Merge commit '7f16397f3c37a8e378239974b73afbfe2b6e6844' into glitch-soc/merge-upstream

Conflicts:
- `lib/mastodon/version.rb`:
  Upstream bumped the mastodon API version, glitch-soc has a change on an adjacent
  line adding a glitch API version.
This commit is contained in:
Claire
2026-02-27 21:25:37 +01:00
86 changed files with 1440 additions and 273 deletions

View File

@@ -6408,15 +6408,15 @@ a.status-card {
line-height: 20px;
color: var(--color-text-secondary);
h1 {
:where(h1) {
font-size: 16px;
line-height: 24px;
color: var(--color-text-primary);
font-weight: 500;
}
&:not(:only-child) {
margin-bottom: 8px;
}
:where(h1:not(:only-child)) {
margin-bottom: 8px;
}
strong {