Thibaut Girka e97d76632d Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/admin/settings_controller.rb - app/models/form/admin_settings.rb Conflicts caused by upstream refactoring, while we have flavours and skins, with the flavour_and_skin pseudo-setting.		2019-03-26 16:01:59 +01:00
..
contrast	Fix color of static page links in high contrast theme (#10028)	2019-02-13 05:30:49 +01:00
fonts	Font styles are now packagified	2017-11-18 11:05:00 -08:00
mastodon	Merge branch 'master' into glitch-soc/merge-upstream	2019-03-26 16:01:59 +01:00
mastodon-light	Disable box shadows for featured hashtags in light theme (#10034)	2019-02-13 18:33:03 +01: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	Add moderation warnings (#9519)	2018-12-22 20:02:09 +01: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