Thibaut Girka 3e686beaea Merge branch 'master' into glitch-soc/merge-upstream ...

Conflicts:
- config/routes.rb
  Upstream changed some admin routes, conflict was because of an added :show
  action for statuses on our side. Kept it.

2018-12-23 11:28:28 +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-23 11:28:28 +01:00

mastodon-light

Improve style of notice/alert messages (#8973)

2018-10-13 01:51:30 +02:00

application.scss

Add new first-time tutorial (#9531)

2018-12-17 11:07:17 +01:00

contrast.scss

Separate high contrast theme (#7213)

2018-04-21 21:35:55 +02:00

mailer.scss

Add moderation warnings (#9519)

2018-12-22 20:02:09 +01: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