Mastodon

History

Claire 60298af3c4 Merge commit 'c6684aa1e392f2dd86af4362b4259809549abaad' into glitch-soc/merge-upstream

Conflicts:
- `app/views/layouts/application.html.haml`:
  Upstream changed how the `inert.css` file is included.
  The conflict is caused by glitch-soc's theming system.
  Ported the upstream change.

Additional changes:
- `config/webpack/shared.js`: bypass glitch-soc's theming
  system for `inert` pack.

2024-01-15 20:01:36 +01:00

contrast

Fix translate button position (#25807 )

2023-07-08 00:12:31 +02:00

fonts

Merge commit '73b64b89170cb72854a1709186c62ce31f476889' into glitch-soc/merge-upstream

2023-07-13 13:49:58 +02:00

mastodon

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

2023-12-21 19:04:20 +01:00

mastodon-light

Fix destructive actions in dropdowns not using error color in light theme (#28484 )