mastodon/app/javascript/styles/mastodon
Claire 876aa35350 Merge commit 'ffc5be4820ed7bad4656489f096230dd7965140b' into glitch-soc/merge-upstream
Conflicts:
- `package.json`:
  Upstream updated a dependency that is on an adjacent line to a
  glitch-soc-only dependency in that file.
  Updated as upstream did.
- `yarn.lock`:
  Upstream updated a dependency that is on an adjacent line to a
  glitch-soc-only dependency in that file.
  Updated as upstream did.
2024-03-19 19:21:12 +01:00
..
_mixins.scss Change design of compose form in web UI (#28119) 2024-01-25 15:41:31 +00:00
about.scss Change background color in web UI (#29522) 2024-03-12 09:51:30 +00:00
accessibility.scss
accounts.scss
admin.scss Merge commit 'ffc5be4820ed7bad4656489f096230dd7965140b' into glitch-soc/merge-upstream 2024-03-19 19:21:12 +01:00
basics.scss Change background color in web UI (#29522) 2024-03-12 09:51:30 +00:00
branding.scss
components.scss Merge commit 'ffc5be4820ed7bad4656489f096230dd7965140b' into glitch-soc/merge-upstream 2024-03-19 19:21:12 +01:00
containers.scss Change design of compose form in web UI (#28119) 2024-01-25 15:41:31 +00:00
dashboard.scss
emoji_picker.scss Change design of compose form in web UI (#28119) 2024-01-25 15:41:31 +00:00
forms.scss Add notification policies and notification requests in web UI (#29433) 2024-03-11 15:02:21 +00:00
lists.scss
modal.scss Change design of compose form in web UI (#28119) 2024-01-25 15:41:31 +00:00
polls.scss Change design of compose form in web UI (#28119) 2024-01-25 15:41:31 +00:00
reset.scss
rich_text.scss
rtl.scss
statuses.scss
tables.scss
variables.scss Change mute, block and domain block confirmations in web UI (#29576) 2024-03-15 17:36:41 +00:00
widgets.scss