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 c91d9b7389 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
	app/lib/user_settings_decorator.rb
	app/models/user.rb
	app/serializers/initial_state_serializer.rb
	app/views/stream_entries/_simple_status.html.haml
	config/locales/simple_form.en.yml
	config/locales/simple_form.ja.yml
	config/locales/simple_form.pl.yml
	config/routes.rb
8 years ago
..
contrast Fix text colors (#7227) 8 years ago
fonts Font styles are now packagified 8 years ago
mastodon Merge branch 'master' into glitch-soc/merge-upstream 8 years ago
mastodon-light Update light theme (#8392) 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 Separate font-family into variable (#8763) 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