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

2018-10-01 12:43:20 +02:00

..

contrast

Fix text colors (#7227)

2018-04-22 14:29:40 +02:00

fonts

Font styles are now packagified

2017-11-18 11:05:00 -08:00

mastodon

Merge branch 'master' into glitch-soc/merge-upstream

2018-10-01 12:43:20 +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

Separate font-family into variable (#8763)

2018-09-23 20:41:24 +02: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