luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-11-25 16:24:00 +00:00
Code Issues Projects Releases Wiki Activity
mastodon/app/javascript/styles
History
Thibaut Girka f26f1145ac Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
	Dockerfile
	app/javascript/packs/common.js
	config/webpack/loaders/sass.js
	config/webpack/shared.js
	db/schema.rb
	package.json
	yarn.lock

A lot of the conflicts come from updating webpack.

Even though upstream deleted app/javascript/packs/common.js, I kept
glitch-soc's version as it unifies JS/CSS packs behavior across flavours.

Ported glitch changes to webpack 4.x
2018-07-16 14:50:42 +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-07-16 14:50:42 +02:00
mastodon-light Revert "Fix dark background error on user-mention autosuggest (#7937)" (#7964) 2018-07-06 13:19:18 +02:00
application.scss Add white outline to black emojis (fix #5083) (#7936) 2018-07-04 17:35:02 +02: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