Claire fe5f6bc7ed Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `.github/workflows/build-image.yml`: Fix erroneous deletion in a previous merge. - `Gemfile`: Conflict caused by glitch-soc-only hCaptcha dependency - `app/controllers/auth/sessions_controller.rb`: Minor conflict due to glitch-soc's theming system. - `app/controllers/filters_controller.rb`: Minor conflict due to glitch-soc's theming system. - `app/serializers/rest/status_serializer.rb`: Minor conflict due to glitch-soc having an extra `local_only` property		2022-06-28 11:11:18 +02:00
..
contrast	Fix contrast of some elements with new brand colors (#18691)	2022-06-19 08:18:08 +02:00
fonts	Merge branch 'main' into glitch-soc/merge-upstream	2022-06-02 09:49:38 +02:00
mastodon	Merge branch 'main' into glitch-soc/merge-upstream	2022-06-28 11:11:18 +02:00
mastodon-light	Fix contrast of some elements with new brand colors (#18691)	2022-06-19 08:18:08 +02:00
application.scss	Change brand color and logotypes (#18592)	2022-06-09 22:25:23 +02:00
contrast.scss	Separate high contrast theme (#7213)	2018-04-21 21:35:55 +02:00
mailer.scss	Remove sign-in token authentication, instead send e-mail about new sign-in (#17970)	2022-04-06 20:58:12 +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