Claire 443ec4f8ba Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/views/admin/tags/index.html.haml`: Removed upstream while it had changes in glitch-soc to accomodate for the theming system. Additional changes to accomodate for the theming system: - `app/views/admin/trends/links/preview_card_providers/index.html.haml` - `app/views/admin/trends/links/index.html.haml` - `app/views/admin/trends/tags/index.html.haml` - `app/views/admin/tags/show.html.haml`		2021-11-25 23:50:35 +01:00
..
_mixins.scss	…
about.scss	…
accessibility.scss	…
accounts.scss	Add trending links (#16917)	2021-11-25 13:07:38 +01:00
admin.scss	Merge branch 'main' into glitch-soc/merge-upstream	2021-11-19 18:51:41 +01:00
basics.scss	…
boost.scss	…
compact_header.scss	…
components.scss	Merge branch 'main' into glitch-soc/merge-upstream	2021-10-14 21:44:57 +02:00
containers.scss	…
dashboard.scss	Add trending links (#16917)	2021-11-25 13:07:38 +01:00
emoji_picker.scss	Fix background-color of emoji-mart selector (#17011)	2021-11-19 18:21:37 +01:00
footer.scss	…
forms.scss	…
introduction.scss	…
lists.scss	…
modal.scss	…
polls.scss	…
reset.scss	…
rtl.scss	…
statuses.scss	…
tables.scss	…
variables.scss	…
widgets.scss	…