luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-11-07 15:34:55 +00:00
Code Issues Projects Releases Wiki Activity
mastodon/app/javascript/styles
History
Thibaut Girka 291012ec0c Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/controllers/accounts_controller.rb
- app/controllers/follower_accounts_controller.rb
- app/controllers/statuses_controller.rb

All conflicts caused by the additional `use_pack` used for glitch-soc's theming
system.
2019-03-18 18:03:27 +01:00
..
contrast Fix color of static page links in high contrast theme (#10028) 2019-02-13 05:30:49 +01:00
fonts
mastodon Merge branch 'master' into glitch-soc/merge-upstream 2019-03-18 18:03:27 +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
mailer.scss Add moderation warnings (#9519) 2018-12-22 20:02:09 +01:00
mastodon-light.scss
win95.scss Fix syntax errors in win95 SCSS file 2019-01-02 15:36:59 +01:00