Claire 3465d39494 Merge commit '24ef8255b3f9b44cb54f49bc78fe3382a7070b1a' into glitch-soc/merge-upstream ... Conflicts: - `app/helpers/accounts_helper.rb`: Upstream removed a helper, textually adjacent to a glitch-soc-only one. Not really a conflict. Removed the helper as upstream did. - `app/views/layouts/embedded.html.haml`: Conflicts due to theming system. Adapted upstream's change to our theming system. - `app/views/statuses/_simple_status.html.haml`: Removed upstream, but we had local changes. Removed as upstream did.		2024-09-12 20:05:08 +02:00
..
contrast	Update CSS color variables to match our latest design system (#31510)	2024-08-20 15:56:44 +00:00
fonts	Merge commit '7f471e70c0e1cc106747634d20f173a68a9272d7' into glitch-soc/merge-upstream	2024-01-15 21:30:00 +01:00
mastodon	Merge commit '24ef8255b3f9b44cb54f49bc78fe3382a7070b1a' into glitch-soc/merge-upstream	2024-09-12 20:05:08 +02:00
mastodon-light	Fix alt text modal styling (#31844)	2024-09-10 17:33:55 +00:00
application.scss	Change embedded posts to use web UI (#31766)	2024-09-12 09:41:19 +00:00
contrast.scss	Separate high contrast theme (#7213)	2018-04-21 21:35:55 +02:00
inert.scss	Use the assets pipeline to load inert.css (#28701)	2024-01-12 09:32:45 +00:00
mailer.scss	New welcome email (#28883)	2024-03-01 12:16:53 +00:00
mastodon-light.scss	More polished light theme (#7620)	2018-05-25 18:36:26 +02:00
win95.scss	Fix deprecation warning in win95 theme	2024-07-10 17:46:33 +02:00