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 a9eaa780f5 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- app/javascript/mastodon/features/compose/components/compose_form.js
  Upstream cleaned up a bit, including on lines in which
  we replaced the hardcoded 500 character limit with a maxChar
  constant. Applied the changes while keeping maxChar instead of 500.
- app/javascript/packs/public.js
  Moved upstream's new animated avatar hover handling in
  app/javascript/core/public.js
- app/javascript/styles/fonts/montserrat.scss
  Upstream fixed local font name, applied those changes.
- app/javascript/styles/fonts/roboto.scss
  Upstream fixed local font name, applied those changes.
- lib/mastodon/version.rb
  Upstream made repo URL configurable, did the same, but
  default to glitch-soc
7 years ago
..
contrast Fix color of static page links in high contrast theme (#10028) 7 years ago
fonts Merge branch 'master' into glitch-soc/merge-upstream 7 years ago
mastodon Merge branch 'master' into glitch-soc/merge-upstream 7 years ago
mastodon-light Disable box shadows for featured hashtags in light theme (#10034) 7 years ago
application.scss Add polls (#10111) 7 years ago
contrast.scss
mailer.scss Add moderation warnings (#9519) 7 years ago
mastodon-light.scss
win95.scss Fix syntax errors in win95 SCSS file 7 years ago