mastodon/app/javascript/styles
Claire b368c75029 Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `app/controllers/concerns/sign_in_token_authentication_concern.rb`:
  Upstream removed this file, while glitch-soc had changes to deal with
  its theming system.
  Removed the file like upstream did.
2022-04-06 21:10:23 +02: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-03-30 13:40:10 +02:00
mastodon-light Fix edit history dropdown and modal in light theme (#17740) 2022-03-10 17:59:23 +01:00
application.scss Remove Atom feeds and old URLs in the form of GET /:username/updates/:id (#11247) 2019-07-07 16:16:51 +02:00
contrast.scss
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
win95.scss Fix syntax errors in win95 SCSS file 2019-01-02 15:36:59 +01:00