mastodon/app/javascript/styles
Claire 85558a5e18 Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `README.md`:
  Minor upstream change, our README is completely different.
  Kept ours.
- `lib/tasks/assets.rake`:
  glitch-soc has extra code to deal with its theming system,
  upstream changed a line that exists in glitch-soc.
  Applied upstream changes.
2023-02-09 12:46:12 +01:00
..
contrast Fix wrong colors in the high-contrast theme (#19708) 2022-11-04 02:28:14 +01:00
fonts Merge branch 'main' into glitch-soc/merge-upstream 2022-10-28 19:23:58 +02:00
mastodon Merge branch 'main' into glitch-soc/merge-upstream 2023-02-09 12:46:12 +01:00
mastodon-light Fix styling of featured tags in light theme (#23252) 2023-01-25 16:28:29 +01:00
application.scss Change public accounts pages to mount the web UI (#19319) 2022-10-20 14:35:29 +02:00
contrast.scss Separate high contrast theme (#7213) 2018-04-21 21:35:55 +02:00
mailer.scss Remove sign-in token authentication, instead send e-mail about new sign-in (#17970) 2022-04-06 20:58:12 +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