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 20d01a954e Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- app/controllers/settings/preferences_controller.rb
- app/lib/user_settings_decorator.rb
- app/models/user.rb

Conflicts due to the addition of a new preference upstream,
“advanced layout”.
7 years ago
..
contrast Fix some colors of high contrast theme (#10711) 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 Fix some colors in light theme (#10754) 7 years ago
application.scss Add polls (#10111) 7 years ago
contrast.scss Separate high contrast theme (#7213) 8 years ago
mailer.scss Add moderation warnings (#9519) 7 years ago
mastodon-light.scss More polished light theme (#7620) 8 years ago
win95.scss Fix syntax errors in win95 SCSS file 7 years ago