mastodon/app/javascript/styles
Thibaut Girka 1b0ff4cd69 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- app/controllers/settings/notifications_controller.rb
- app/javascript/packs/public.js
- app/views/settings/preferences/show.html.haml
- app/views/stream_entries/_simple_status.html.haml
- config/locales/simple_form.en.yml
- config/locales/simple_form.pl.yml
- config/navigation.rb
- config/routes.rb
2019-06-10 18:59:53 +02:00
..
contrast Fix sass-lint config (#10982) 2019-06-06 18:51:46 +02:00
fonts Merge branch 'master' into glitch-soc/merge-upstream 2019-04-22 20:40:04 +02:00
mastodon Merge branch 'master' into glitch-soc/merge-upstream 2019-06-10 18:59:53 +02:00
mastodon-light Fix more issues in the light theme (#10996) 2019-06-08 22:32:59 +02:00
application.scss Add polls (#10111) 2019-03-03 22:18:23 +01:00
contrast.scss Separate high contrast theme (#7213) 2018-04-21 21:35:55 +02:00
mailer.scss Fix sass-lint config (#10982) 2019-06-06 18:51:46 +02:00
mastodon-light.scss More polished light theme (#7620) 2018-05-25 18:36:26 +02:00
win95.scss Fix syntax errors in win95 SCSS file 2019-01-02 15:36:59 +01:00