Claire 95a1fde6b6 Merge commit '73b64b8917' into glitch-soc/merge-upstream ... Conflicts: - `app/javascript/styles/fonts/roboto-mono.scss`: Upstream updated the linter, which changed a few linter rules. Some of those changed lines are different in glitch-soc because we use different paths for the assets. Applied the same style rules on our version of the file. - `app/javascript/styles/fonts/roboto.scss`: Upstream updated the linter, which changed a few linter rules. Some of those changed lines are different in glitch-soc because we use different paths for the assets. Applied the same style rules on our version of the file.		2023-07-13 13:49:58 +02:00
..
contrast	Fix translate button position (#25807)	2023-07-08 00:12:31 +02:00
fonts	Merge commit '73b64b8917' into glitch-soc/merge-upstream	2023-07-13 13:49:58 +02:00
mastodon	Merge commit '73b64b8917' into glitch-soc/merge-upstream	2023-07-13 13:49:58 +02:00
mastodon-light	fix buttons showing inconsistent styles (#25903)	2023-07-11 12:26:09 +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