Thibaut Girka 65e994b29b Merge branch 'master' into glitch-soc/merge-upstream ...

Conflicts:
- app/controllers/directories_controller.rb
- app/controllers/settings/applications_controller.rb
- app/controllers/settings/base_controller.rb
- app/controllers/settings/deletes_controller.rb
- app/controllers/settings/exports_controller.rb
- app/controllers/settings/follower_domains_controller.rb
- app/controllers/settings/imports_controller.rb
- app/controllers/settings/migrations_controller.rb
- app/controllers/settings/notifications_controller.rb
- app/controllers/settings/preferences_controller.rb
- app/controllers/settings/sessions_controller.rb
- app/controllers/settings/two_factor_authentication/confirmations_controller.rb
- app/controllers/settings/two_factor_authentication/recovery_codes_controller.rb
- app/controllers/settings/two_factor_authentications_controller.rb

Conflicts were due to some refactoring already made in glitch-soc
when introducing flavours.

2018-12-15 10:45:53 +01: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-12-15 10:45:53 +01:00

mastodon-light

Improve style of notice/alert messages (#8973)

2018-10-13 01:51:30 +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