Glitch-Shrike/app/javascript/styles/mastodon
Claire 85558a5e18 Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `README.md`:
  Minor upstream change, our README is completely different.
  Kept ours.
- `lib/tasks/assets.rake`:
  glitch-soc has extra code to deal with its theming system,
  upstream changed a line that exists in glitch-soc.
  Applied upstream changes.
2023-02-09 12:46:12 +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 2023-01-18 17:38:11 +01:00
basics.scss
boost.scss
branding.scss
components.scss Merge branch 'main' into glitch-soc/merge-upstream 2023-02-09 12:46:12 +01:00
containers.scss
dashboard.scss
emoji_picker.scss Fix double button to clear emoji search input (#19888) 2022-11-07 03:40:54 +01:00
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 Fix wrong padding in RTL layout in web UI (#23157) 2023-01-19 15:51:14 +01:00
reset.scss
rtl.scss Fix wrong padding in RTL layout in web UI (#23157) 2023-01-19 15:51:14 +01:00
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