Merge branch 'main' into glitch-soc/merge-upstream

Conflicts: - `package.json`: Not really a conflict, upstream updated a dependency textually adjacent to a glitch-soc-only one. Updated the dependency as upstream did.
2022-05-03 10:16:49 +02:00
parent cb9a919ff2 7e244879fe
commit 3869daef09
67 changed files with 1518 additions and 892 deletions
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@ -4053,7 +4053,7 @@ a.status-card.compact:hover {
  }

  & > span {
-    max-width: 400px;
+    max-width: 500px;
  }

  a {