Claire f9d000ebae Merge branch 'master' into glitch-soc/merge-upstream ...

Conflicts:
- `app/services/resolve_url_service.rb`:
  The private toot search by URL hack has been revamped upstream.
  Took upstream's version.

2020-12-19 00:55:12 +01:00

..

contrast

Fix unreadable placeholder text color in high contrast theme in web UI (#14803)

2020-09-15 09:24:24 +02:00

fonts

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

2019-04-22 20:40:04 +02:00

mastodon

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

2020-12-19 00:55:12 +01:00

mastodon-light

Fix styles for RTL languages and the light theme (#15356)

2020-12-18 08:47:36 +01:00

application.scss

Remove Atom feeds and old URLs in the form of GET /:username/updates/:id (#11247)

2019-07-07 16:16:51 +02:00

contrast.scss

Separate high contrast theme (#7213)

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

mailer.scss

Change RTL detection to rely on unicode-bidi paragraph by paragraph (#14573)

2020-12-15 12:56:43 +01:00

mastodon-light.scss

More polished light theme (#7620)

2018-05-25 18:36:26 +02:00

win95.scss

Fix syntax errors in win95 SCSS file

2019-01-02 15:36:59 +01:00