mastodon/app/javascript/styles
Claire 0e74d4da59 Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `.github/dependabot.yml`:
  Changed upstream, while we modified it in glitch-soc to not get spammed
  by dependabot.
  Kept it removed.
- `README.md`:
  Changed upstream, which has a very different version.
  Discarded upstream changes.
2022-06-21 08:28:59 +02:00
..
contrast Fix contrast of some elements with new brand colors (#18691) 2022-06-19 08:18:08 +02:00
fonts Merge branch 'main' into glitch-soc/merge-upstream 2022-06-02 09:49:38 +02:00
mastodon Merge branch 'main' into glitch-soc/merge-upstream 2022-06-21 08:28:59 +02:00
mastodon-light Fix contrast of some elements with new brand colors (#18691) 2022-06-19 08:18:08 +02:00
application.scss Change brand color and logotypes (#18592) 2022-06-09 22:25:23 +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