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.
mastodon/app/javascript/styles
Thibaut Girka 9c3b9d5ab9 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- `.env.production.sample`:
  Upstream deleted it, I decided to keep it.
- `package.json`:
  Upstream updated a dependency textually too close to wavesurfer.js
  which has been deleted from upstream but is kept in glitch-soc for now.
5 years ago
..
contrast Fix sass-lint config (#10982) 6 years ago
fonts Merge branch 'master' into glitch-soc/merge-upstream 6 years ago
mastodon Merge branch 'master' into glitch-soc/merge-upstream 5 years ago
mastodon-light Improve rendering of emoji which do not contrast with background (#13772) 5 years ago
application.scss Remove Atom feeds and old URLs in the form of `GET /:username/updates/:id` (#11247) 6 years ago
contrast.scss
mailer.scss Add option to include reported statuses in warning e-mail (#11639) 6 years ago
mastodon-light.scss More polished light theme (#7620) 7 years ago
win95.scss Fix syntax errors in win95 SCSS file 6 years ago