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

..

_mixins.scss

…

about.scss

Fix styling issue on /about when server admin has a long username (#15357)

2020-12-18 09:43:33 +01:00

accessibility.scss

…

accounts.scss

Fix lock icon not being shown when locking account in profile settings (#14190)

2020-07-01 13:51:50 +02:00

admin.scss

…

basics.scss

…

boost.scss

Change media modals look in web UI (#15217)

2020-11-27 03:24:11 +01:00

compact_header.scss

…

components.scss

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

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

containers.scss

…

dashboard.scss

…

emoji_picker.scss

…

footer.scss

…

forms.scss

Add ability to require invite request text (#15326)

2020-12-14 10:03:09 +01:00

introduction.scss

…

lists.scss

…

modal.scss

…

polls.scss

…

reset.scss

…

rtl.scss

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

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

statuses.scss

…

tables.scss

…

variables.scss

Add interrelationship icon (#15149)

2020-11-12 17:43:12 +01:00

widgets.scss

Add interrelationship icon (#15149)

2020-11-12 17:43:12 +01:00