David Yip e0eebba461

Merge remote-tracking branch 'origin/master' into merge-upstream ...

Conflicts:
 	app/controllers/follower_accounts_controller.rb
 	app/controllers/following_accounts_controller.rb
 	app/controllers/settings/preferences_controller.rb
 	app/lib/user_settings_decorator.rb
 	app/models/user.rb
 	config/locales/simple_form.en.yml

2018-05-18 08:47:10 -05: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 remote-tracking branch 'origin/master' into merge-upstream

2018-05-18 08:47:10 -05:00

application.scss

Replace drawer elephant graphic with a vector image (#6286)

2018-01-19 15:25:27 +01: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

Add a light theme

2018-05-04 20:25:58 +02:00

win95.scss

Strip trailing whitespace on win95.scss

2018-01-18 10:54:50 -06:00