luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-12-01 19:14:23 +00:00
Code Issues Projects Releases Wiki Activity
mastodon/app/javascript/styles
History
Thibaut Girka 91bef4759f Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
	Vagrantfile
	app/javascript/packs/public.js
	app/views/admin/settings/edit.html.haml
	app/views/settings/preferences/show.html.haml
	app/views/settings/profiles/show.html.haml
	config/locales/es.yml
	config/locales/simple_form.en.yml
	config/webpack/configuration.js
	config/webpack/loaders/babel.js
	package.json
	yarn.lock

Split new additions to app/javascript/packs/public.js to
app/javascript/core/settings.js
2018-09-19 21:46:01 +02:00
..
contrast Fix text colors (#7227) 2018-04-22 14:29:40 +02:00
fonts
mastodon Merge branch 'master' into glitch-soc/merge-upstream 2018-09-19 21:46:01 +02:00
mastodon-light Update light theme (#8392) 2018-08-23 19:20:49 +02:00
application.scss Redesign public profiles and toots (#8068) 2018-07-28 19:25:33 +02:00
contrast.scss Separate high contrast theme (#7213) 2018-04-21 21:35:55 +02:00
mailer.scss
mastodon-light.scss More polished light theme (#7620) 2018-05-25 18:36:26 +02:00
win95.scss