Leatherface/mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2025-12-15 16:59:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit 'd27eb181f6ab419d1745a1fe9b94094be17a618f' into glitch-soc/merge-upstream

Browse Source 
Conflicts:
- `spec/requests/api/v2/instance_spec.rb`:
  Conflict due to glitch-soc having a different default site name.
  Updated the tests as upstream did, keeping glitch-soc's default name.
This commit is contained in:
Claire
2024-05-01 17:22:02 +02:00
parent 87b9b23025 d27eb181f6
commit 15f6d2d038
19 changed files with 88 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -10104,9 +10104,10 @@ noscript {
}
.filtered-notifications-banner__badge {
background-color: $highlight-text-color;
background: $ui-button-background-color;
border-radius: 4px;
padding: 1px 6px;
color: $white;
}
}