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.

app/javascript/styles/mastodon/admin.scss

@@ -1396,6 +1396,19 @@ a.sparkline {
 .account-card {
   border-radius: 4px;
   border: 1px solid lighten($ui-base-color, 8%);
+  position: relative;
+
+  &__warning-badge {
+    position: absolute;
+    padding: 4px 10px;
+    top: 10px;
+    inset-inline-start: 10px;
+    border-radius: 4px;
+    background:
+      url('../images/warning-stripes.svg') repeat-y left,
+      url('../images/warning-stripes.svg') repeat-y right,
+      var(--background-color);
+  }
 
   &__permalink {
     color: inherit;

app/javascript/styles/mastodon/components.scss

@@ -1688,6 +1688,7 @@ body > [data-popper-placement] {
 
   .animated-number {
     color: $secondary-text-color;
+    font-weight: 500;
   }
 }