gnh1201/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2025-10-31 13:18:18 +00:00
Code Issues Actions 26 Packages Projects Releases Wiki Activity
b7508940b7
mastodon/app/javascript/styles
History
Thibaut Girka 659b8a12ec Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
	config/locales/ca.yml
	config/locales/nl.yml
	config/locales/oc.yml
	config/locales/pt-BR.yml

Resolved conflicts by removing upstream-specific changes
2018-05-27 13:20:15 +02: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-05-27 13:20:15 +02:00
mastodon-light Fix color mistakes in mastodon-light theme (#7626) 2018-05-26 10:53:44 +02:00
application.scss Replace drawer elephant graphic with a vector image (#6286) 2018-01-19 15:25:27 +01:00
contrast.scss Separate high contrast theme (#7213) 2018-04-21 21:35:55 +02:00
mailer.scss Improve HTML e-mails based on Litmus tests (#6301) 2018-01-20 01:32:21 +01: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