Merge commit 'ead13d4826a7ba1699d6bb310e58642b15687671' into glitch-soc/merge-upstream

app/javascript/styles/mastodon/admin.scss

@@ -487,6 +487,8 @@ $content-width: 840px;
     .title {
       font-weight: 600;
       margin-bottom: 8px;
+      font-size: inherit;
+      line-height: inherit;
     }
 
     a {

app/javascript/styles/mastodon/forms.scss

@@ -557,7 +557,6 @@ code {
     display: block;
     width: 100%;
     font-family: inherit;
-    resize: vertical;
     background: var(--color-bg-secondary);
     border: 1px solid var(--color-border-primary);
     border-radius: 4px;
@@ -584,6 +583,10 @@ code {
     }
   }
 
+  textarea {
+    resize: vertical;
+  }
+
   input[type='text'],
   input[type='number'],
   input[type='email'],