Claire f3a4d57be1 Merge branch 'main' into glitch-soc/merge-upstream ...

Conflicts:
- `README.md`:
  Discarded upstream changes: we have our own README
- `app/controllers/follower_accounts_controller.rb`:
  Port upstream's minor refactoring

2022-12-15 20:25:25 +01:00

..

_mixins.scss

…

about.scss

…

accessibility.scss

…

accounts.scss

Revert "Revert "Change "Allow trends without prior review" setting to include statuses (#17977)""

2022-11-12 10:17:22 +01:00

admin.scss

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

2022-12-15 20:25:25 +01:00

basics.scss

…

boost.scss

…

branding.scss

…

components.scss

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

2022-12-15 20:25:25 +01:00

containers.scss

…

dashboard.scss

…

emoji_picker.scss

…

forms.scss

Revert "Revert "Change "Allow trends without prior review" setting to include statuses (#17977)""

2022-11-12 10:17:22 +01:00

lists.scss

…

modal.scss

Add transparancy to modal background for accessibility (#18081)

2022-12-15 17:38:35 +01:00

polls.scss

…

reset.scss

…

rtl.scss

…

statuses.scss

…

tables.scss

Stick batch table toolbar to the top (#20442)

2022-11-13 21:02:28 +01:00

variables.scss

…

widgets.scss

Add left and right margin to emojis (#20464)

2022-12-15 18:53:37 +01:00