You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
nyastodon/app/javascript/styles
Claire 93912f0498 Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `app/models/account.rb`:
  Conflict because we (glitch-soc) have disabled trending of posts without
  review.
  Discarded that upstream change.
- `app/views/admin/settings/discovery/show.html.haml`:
  Just an extra setting in glitch-soc.
  Kept that extra setting.
2 years ago
..
contrast Fix wrong colors in the high-contrast theme (#19708) 2 years ago
fonts Merge branch 'main' into glitch-soc/merge-upstream 2 years ago
mastodon Merge branch 'main' into glitch-soc/merge-upstream 2 years ago
mastodon-light Fix color of the “No description added“ media upload warning on light theme (#20328) 2 years ago
application.scss Change public accounts pages to mount the web UI (#19319) 2 years ago
contrast.scss Separate high contrast theme (#7213) 6 years ago
mailer.scss Remove sign-in token authentication, instead send e-mail about new sign-in (#17970) 2 years ago
mastodon-light.scss More polished light theme (#7620) 6 years ago
win95.scss Update win95 style from cybre.space 2 years ago