catstodon/app/javascript/styles
Thibaut Girka 034ffc079e Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- app/controllers/admin/base_controller.rb
  Some refactoring made upstream, no real conflict.
- app/javascript/mastodon/features/compose/components/compose_form.js
  Updated using upstream's code but using maxChars instead of the
  hardcoded length of 500 characters per toot.
- app/javascript/styles/mastodon/components.scss
  Upstream redesigned the onboarding modal. Not sure why we had a
  conflict there.
2018-12-18 16:55:15 +01:00
..
contrast Fix text colors (#7227) 2018-04-22 14:29:40 +02:00
fonts Font styles are now packagified 2017-11-18 11:05:00 -08:00
mastodon Merge branch 'master' into glitch-soc/merge-upstream 2018-12-18 16:55:15 +01:00
mastodon-light Improve style of notice/alert messages (#8973) 2018-10-13 01:51:30 +02:00
application.scss Add new first-time tutorial (#9531) 2018-12-17 11:07:17 +01:00
contrast.scss Separate high contrast theme (#7213) 2018-04-21 21:35:55 +02:00
mailer.scss Separate font-family into variable (#8763) 2018-09-23 20:41:24 +02:00
mastodon-light.scss More polished light theme (#7620) 2018-05-25 18:36:26 +02:00
win95.scss Strip trailing whitespace on win95.scss 2018-01-18 10:54:50 -06:00