Claire 5e11f3a6e1 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/javascript/styles/mastodon/modal.scss`: For some reason we changed the file loading path in glitch-soc, but now upstream has completely changed how the logo is loaded. Applied upstream changes.		2021-02-12 10:28:32 +01:00
..
contrast	Fix unreadable placeholder text color in high contrast theme in web UI (#14803)	2020-09-15 09:24:24 +02:00
fonts
mastodon	Merge branch 'main' into glitch-soc/merge-upstream	2021-02-12 10:28:32 +01:00
mastodon-light	Fix styles for RTL languages and the light theme (#15356)	2020-12-18 08:47:36 +01:00
application.scss	Remove Atom feeds and old URLs in the form of GET /:username/updates/:id (#11247)	2019-07-07 16:16:51 +02:00
contrast.scss
mailer.scss	Change RTL detection to rely on unicode-bidi paragraph by paragraph (#14573)	2020-12-15 12:56:43 +01:00
mastodon-light.scss
win95.scss