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 280d7b1df8 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
	app/models/status.rb
	db/migrate/20180528141303_fix_accounts_unique_index.rb
	db/schema.rb

Resolved by taking upstream changes (no real conflicts, just glitch-soc
specific code too close to actual changes).
8 years ago
..
contrast Fix text colors (#7227) 8 years ago
fonts
mastodon Merge branch 'master' into glitch-soc/merge-upstream 8 years ago
mastodon-light Revert "Fix dark background error on user-mention autosuggest (#7937)" (#7964) 8 years ago
application.scss Redesign public profiles and toots (#8068) 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