Claire 6281c4dedd Merge commit '1fc165de02d79294c8a218f5fa82bcd477484ca1' into glitch-soc/merge-upstream ... Conflicts: - `.env.production.sample`: Upstream added a block of three environment variables, while glitch-soc has a different version of the file overall. Added upstream's changes. - `app/helpers/application_helper.rb`: Upstream added a helper, while glitch-soc had extra helpers. Added upstream's helper.		2024-10-19 19:13:32 +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 '1fc165de02d79294c8a218f5fa82bcd477484ca1' into glitch-soc/merge-upstream	2024-10-19 19:13:32 +02:00
mastodon-light	Fix sass deprecation warning (#31961)	2024-09-18 17:39:32 +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	Mailer layout fixes (#32132)	2024-09-27 19:41:41 +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