mastodon/app/javascript/styles
Claire 322e907e04 Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `app/views/settings/preferences/appearance/show.html.haml`:
  Upstream renamed some helper functions that were used in a part of the
  settings page which glitch-soc slightly changed the layout of.
  Ported the change.
2022-02-09 17:28:33 +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 Merge branch 'main' into glitch-soc/merge-upstream 2021-10-14 22:14:26 +02:00
mastodon Merge branch 'main' into glitch-soc/merge-upstream 2022-02-09 17:28:33 +01:00
mastodon-light Fixing the hero widget (#15926) 2021-03-19 20:23:32 +01:00
application.scss
contrast.scss
mailer.scss Add notifications for statuses deleted by moderators (#17204) 2022-01-17 09:41:33 +01:00
mastodon-light.scss
win95.scss