You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
mastodon/app/javascript/styles
Thibaut Girka d392020da6 Merge branch 'master' into glitch-soc/tentative-merge
Conflicts:
	README.md
	app/controllers/statuses_controller.rb
	app/lib/feed_manager.rb
	config/navigation.rb
	spec/lib/feed_manager_spec.rb

Conflicts were resolved by taking both versions for each change.
This means the two filter systems (glitch-soc's keyword mutes and tootsuite's
custom filters) are in place, which will be changed in a follow-up commit.
8 years ago
..
contrast Fix text colors (#7227) 8 years ago
fonts
mastodon Merge branch 'master' into glitch-soc/tentative-merge 8 years ago
mastodon-light Revert "Fix dark background error on user-mention autosuggest (#7937)" (#7964) 8 years ago
application.scss Add white outline to black emojis (fix #5083) (#7936) 8 years ago
contrast.scss Separate high contrast theme (#7213) 8 years ago
mailer.scss Improve HTML e-mails based on Litmus tests (#6301) 8 years ago
mastodon-light.scss More polished light theme (#7620) 8 years ago
win95.scss Strip trailing whitespace on win95.scss 8 years ago