Glitch-Shrike/app/javascript/styles/mastodon
Claire 5fd8780b14 Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `package.json`:
  Not really a conflict, upstream updated a dependency textually adjacent to a
  glitch-soc-only one.
  Updated the dependency as upstream did.
2022-05-11 09:37:48 +02:00
..
_mixins.scss
about.scss
accessibility.scss
accounts.scss
admin.scss Merge branch 'main' into glitch-soc/merge-upstream 2022-03-22 17:00:38 +01:00
basics.scss
boost.scss
compact_header.scss
components.scss Merge branch 'main' into glitch-soc/merge-upstream 2022-05-11 09:37:48 +02:00
containers.scss Change appearance of account cards in web UI (#17689) 2022-03-07 11:38:52 +01:00
dashboard.scss
emoji_picker.scss
footer.scss
forms.scss Change visual separation of applications in authorized apps list (#17686) 2022-03-02 20:28:25 +01:00
introduction.scss
lists.scss
modal.scss
polls.scss Spelling (#17705) 2022-03-06 22:51:40 +01:00
reset.scss
rtl.scss Change appearance of account cards in web UI (#17689) 2022-03-07 11:38:52 +01:00
statuses.scss
tables.scss Change design of federation pages in admin UI (#17704) 2022-03-09 08:52:32 +01:00
variables.scss
widgets.scss