Glitch-Shrike/app/javascript/styles/mastodon
Claire d8b0a732aa Merge commit '1483a3ddfe74e4fb81d87447a1781943eab86c60' into glitch-soc/merge-upstream
Conflicts:
- `config/initializers/simple_form.rb`:
  Upstream added a new simple_form component, where we had an extra one.
  Kept both components.
2023-06-10 16:22:14 +02:00
..
_mixins.scss
about.scss
accessibility.scss
accounts.scss Add card with who invited you to join when displaying rules on sign-up (#23475) 2023-06-02 18:35:37 +02:00
admin.scss Merge commit 'e9385e93e9b4601c87d1f5d6b8ddfd815f7aedcb' into glitch-soc/merge-upstream 2023-06-10 15:09:19 +02:00
basics.scss
boost.scss
branding.scss
components.scss Merge commit '5fae2de454806730742b7be7435ae1c4fb97cf3c' into glitch-soc/merge-upstream 2023-06-10 15:17:08 +02:00
containers.scss
dashboard.scss
emoji_picker.scss
forms.scss Add card with who invited you to join when displaying rules on sign-up (#23475) 2023-06-02 18:35:37 +02:00
lists.scss
modal.scss
polls.scss
reset.scss
rich_text.scss
rtl.scss
statuses.scss
tables.scss
variables.scss
widgets.scss