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 'e0648a916ab81925545504173bf4f43ec64d4f3c' into glitch-soc/merge-upstream

Browse Source 
Conflicts:
- `app/models/custom_emoji.rb`:
  An upstream refactor touched lines adjacent to ones modified in glitch-soc.
  Ported upstream's changes.
This commit is contained in:
Claire
2024-09-16 21:08:58 +02:00
parent 346919178d e0648a916a
commit 665e9129fe
81 changed files with 1501 additions and 663 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -10234,6 +10234,7 @@ noscript {
scroll-padding: 16px;
scroll-behavior: smooth;
overflow-x: scroll;
scrollbar-width: none;
&__card {
background: var(--background-color);