Claire c7ad055ff3 Merge commit 'a0ce77673c977e3a90d0c7d1c2acd250b7fad0c2' into glitch-soc/merge-upstream ...

Conflicts:
- `app/controllers/application_controller.rb`:
  Upstream added an experimental color and contrast theme control.
  Conflicts because of glitch-soc's different theming system.
  Adapted upstream's changes.
- `app/views/layouts/application.html.haml`:
  Upstream added an experimental color and contrast theme control.
  Conflicts because of glitch-soc's different theming system.
  Adapted upstream's changes.
- `app/views/settings/preferences/appearance/show.html.haml`:
  Upstream added an experimental color and contrast theme control.
  Conflicts because of glitch-soc's different theming system.
  Adapted upstream's changes.

2026-01-03 15:26:58 +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 'a0ce77673c977e3a90d0c7d1c2acd250b7fad0c2' into glitch-soc/merge-upstream

2026-01-03 15:26:58 +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