tootlab-mastodon

mirror of https://github.com/glitch-soc/mastodon.git synced 2025-01-15 12:13:18 -05:00

History

Claire 8743b1ea40 Merge branch 'main' into glitch-soc/merge-upstream

Conflicts:
- `app/views/admin/trends/links/index.html.haml`:
  Not really a conflict, upstream change textually too close to a glitch-soc
  change (removed `javascript_pack_tag` to accomodate for glitch-soc's theming
  system).
  Ported upstream changes.
- `app/views/admin/trends/links/preview_card_providers/index.html.haml`:
  Not really a conflict, upstream change textually too close to a glitch-soc
  change (removed `javascript_pack_tag` to accomodate for glitch-soc's theming
  system).
  Ported upstream changes.
- `app/views/admin/trends/statuses/index.html.haml`:
  Not really a conflict, upstream change textually too close to a glitch-soc
  change (removed `javascript_pack_tag` to accomodate for glitch-soc's theming
  system).
  Ported upstream changes.
- `app/views/admin/trends/tags/index.html.haml`:
  Not really a conflict, upstream change textually too close to a glitch-soc
  change (removed `javascript_pack_tag` to accomodate for glitch-soc's theming
  system).
  Ported upstream changes.

2022-03-02 20:48:27 +01:00

_mixins.scss

Revert "Avoid using uppercase text-transform (#12684 )" (#12987 )

2020-01-27 13:44:29 +01:00

about.scss

Remove duplicate CSS properties (#16278 )

2021-05-19 23:51:52 +02:00

accessibility.scss

Improve rendering of emoji which do not contrast with background (#13772 )

2020-06-09 10:28:23 +02:00

accounts.scss

Add trending statuses (#17431 )