Claire ba45eb8764 Merge commit 'bc2f8a358f96a9540e6f39bb1c58273deb4545de' into glitch-soc/merge-upstream ...

Conflicts:
- `app/views/layouts/application.html.haml`:
  Upstream changed how theming works, and in particular changed the set of HTML attributes.
  Adapted upstream's change.

2026-01-15 18:02:35 +01:00

..

entrypoints

Display quotes in email notifications (#36379)

2025-10-07 12:50:40 +00:00

fonts

Use @/ absolute paths instead of relative paths in CSS (#34806)

2025-05-26 07:27:44 +00:00

mastodon

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

2026-01-15 18:02:35 +01:00

application.scss

Fix inversion of emoji colours based on dark/light mode (#37120)

2025-12-05 10:08:59 +00:00

common.scss

Update Wrapstodon design (#37169)

2025-12-09 16:51:05 +00:00

contrast.scss

Fix inversion of emoji colours based on dark/light mode (#37120)

2025-12-05 10:08:59 +00:00

mastodon-light.scss

Fix inversion of emoji colours based on dark/light mode (#37120)

2025-12-05 10:08:59 +00:00