Merge commit '68984de5b503791b814d81a85520af256bf43e11' into glitch-soc/merge-upstream

Conflicts:
- `app/views/admin/settings/discovery/show.html.haml`:
  Glitch-soc has an extra setting textually adjacent to a line upstream has changed.
  Applied upstream's change while keeping glitch-soc's setting.

app/javascript/styles/mastodon/admin.scss

@@ -268,7 +268,7 @@ $content-width: 840px;
         }
       }
 
-      h2 small {
+      h1 small {
         font-size: 12px;
         display: block;
         font-weight: 500;
@@ -282,22 +282,16 @@ $content-width: 840px;
       }
     }
 
-    h2 {
+    :where(h1),
+    .heading-large {
       color: var(--color-text-primary);
       font-size: 24px;
       line-height: 36px;
       font-weight: 700;
     }
 
-    h3 {
-      color: var(--color-text-primary);
-      font-size: 20px;
-      line-height: 28px;
-      font-weight: 400;
-      margin-bottom: 30px;
-    }
-
-    h4 {
+    :where(h2):not(.heading-medium),
+    .heading-small {
       text-transform: uppercase;
       font-size: 13px;
       font-weight: 700;
@@ -307,6 +301,14 @@ $content-width: 840px;
       border-top: 1px solid var(--color-border-primary);
     }
 
+    .heading-medium {
+      color: var(--color-text-primary);
+      font-size: 20px;
+      line-height: 28px;
+      font-weight: 400;
+      margin-bottom: 30px;
+    }
+
     h6 {
       font-size: 16px;
       color: var(--color-text-primary);