masto-fe/app/javascript/styles
Claire eee36267d6 Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `app/javascript/mastodon/locales/ja.json`:
  Upstream change too close to a glitch-soc-specific string.
  The glitch-soc-specific string should not have been in this file, so it
  has been moved to `app/javascript/flavours/glitch/locales/ja.js`.
- `app/javascript/packs/public.js`:
  Upstream refactored a part, that as usual is split and duplicated in various
  pack files. Updated those pack files accordingly.
- `app/views/layouts/application.html.haml`:
  Upstream fixed custom.css path in a different way than we did, went with
  upstream's change.
2022-10-30 18:15:28 +01:00
..
contrast Change public accounts pages to mount the web UI (#19319) 2022-10-20 14:35:29 +02: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-10-30 18:15:28 +01:00
mastodon-light Change public accounts pages to mount the web UI (#19319) 2022-10-20 14:35:29 +02: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