tootlab-mastodon/app/javascript/styles
Claire 92fa9d34b0 Merge commit '3554c527954441fd924586a49c7d99a89101ac7e' into glitch-soc/merge-upstream
Conflicts:
- `app/controllers/authorize_interactions_controller.rb`:
  Small conflict due to our theming system.
- `streaming/index.js`:
  Upstream refactored part of the streaming server.
  We had some extra logic for handling local-only posts.
  Applied the refactor.
2023-07-30 16:11:55 +02: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 '3554c527954441fd924586a49c7d99a89101ac7e' into glitch-soc/merge-upstream 2023-07-30 16:11:55 +02:00
mastodon-light Fix missing border on error screen in light theme in web UI (#26152) 2023-07-24 19:53:33 +02:00
application.scss Add support for incoming rich text (#23913) 2023-03-03 20:19:29 +01:00
contrast.scss Separate high contrast theme (#7213) 2018-04-21 21:35:55 +02:00
mailer.scss Update Stylelint (#25819) 2023-07-12 12:31:23 +02:00
mastodon-light.scss More polished light theme (#7620) 2018-05-25 18:36:26 +02:00
win95.scss Update win95 style from cybre.space 2022-04-27 23:05:24 +02:00