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

2022-06-10 11:51:43 +02:00
parent 3d841eba69 a2871cd747
commit edaaf6a5e9
156 changed files with 1768 additions and 156 deletions
--- a/app/javascript/styles/mastodon/admin.scss
+++ b/app/javascript/styles/mastodon/admin.scss
@ -203,6 +203,14 @@ $content-width: 840px;
        }
      }

+      h2 small {
+        font-size: 12px;
+        display: block;
+        font-weight: 500;
+        color: $darker-text-color;
+        line-height: 18px;
+      }
+
      @media screen and (max-width: $no-columns-breakpoint) {
        border-bottom: 0;
        padding-bottom: 0;