mastodon/app/javascript/styles
Claire 32c70d2f09 Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `app/views/admin/announcements/edit.html.haml`:
  Upstream change too close to theming-related glitch-soc change.
  Ported upstream changes.
- `app/views/admin/announcements/new.html.haml`
  Upstream change too close to theming-related glitch-soc change.
  Ported upstream changes.
2022-11-14 08:35:55 +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 2022-11-14 08:35:55 +01:00
mastodon-light Fix color of the “No description added“ media upload warning on light theme (#20328) 2022-11-10 14:21:31 +01:00
application.scss Change public accounts pages to mount the web UI (#19319) 2022-10-20 14:35:29 +02:00
contrast.scss
mailer.scss
mastodon-light.scss
win95.scss