mastodon/app/javascript/styles/mastodon
Claire b2526316f5 Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `app/views/admin/pending_accounts/index.html.haml`:
  Removed upstream, while it had glitch-soc-specific changes to accomodate
  for glitch-soc's theming system.
  Removed the file.

Additional changes:
- `app/views/admin/accounts/index.html.haml':
  Accomodate for glitch-soc's theming system.
2021-12-16 16:20:44 +01:00
..
_mixins.scss
…
about.scss Remove duplicate CSS properties (#16278) 2021-05-19 23:51:52 +02:00
accessibility.scss
…
accounts.scss Add batch suspend for accounts in admin UI (#17009) 2021-12-05 21:48:39 +01:00
admin.scss Merge branch 'main' into glitch-soc/merge-upstream 2021-11-19 18:51:41 +01:00
basics.scss
…
boost.scss Fix styling of boost button in media modal not reflecting ability to boost (#16387) 2021-06-25 04:45:30 +02:00
compact_header.scss
…
components.scss Merge branch 'main' into glitch-soc/merge-upstream 2021-11-26 22:53:55 +01: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 Remove Keybase integration (#17045) 2021-11-26 05:58:18 +01:00
introduction.scss
…
lists.scss
…
modal.scss Use custom mascot on static share page (#15687) 2021-02-11 02:18:56 +01:00
polls.scss
…
reset.scss
…
rtl.scss Improve hover and focus style in columns settings (#16222) 2021-10-01 00:55:51 +02:00
statuses.scss
…
tables.scss Add batch suspend for accounts in admin UI (#17009) 2021-12-05 21:48:39 +01:00
variables.scss
…
widgets.scss Add batch suspend for accounts in admin UI (#17009) 2021-12-05 21:48:39 +01:00