Merge commit '9d5e10a70e006c1c0bc61e7f591b1078c7be6ab4' into glitch-soc/merge-upstream

app/javascript/styles/mastodon/admin.scss

@@ -442,6 +442,53 @@ $content-width: 840px;
       }
     }
   }
+
+  .callout {
+    display: flex;
+    align-items: start;
+    padding: 12px;
+    gap: 8px;
+    background-color: var(--color-bg-brand-softest);
+    color: var(--color-text-primary);
+    border-radius: 12px;
+    font-size: 15px;
+    margin-bottom: 30px;
+
+    .icon {
+      padding: 4px;
+      border-radius: 9999px;
+      width: 1rem;
+      height: 1rem;
+      margin-top: -2px;
+      background-color: var(--color-bg-brand-soft);
+    }
+
+    .content {
+      display: flex;
+      flex-direction: column;
+      gap: 8px;
+      flex-grow: 1;
+      padding: 0;
+
+      @media screen and (width >= 630px) {
+        flex-direction: row;
+      }
+    }
+
+    .body {
+      flex-grow: 1;
+    }
+
+    .title {
+      font-weight: 600;
+      margin-bottom: 8px;
+    }
+
+    a {
+      color: inherit;
+      font-weight: 600;
+    }
+  }
 }
 
 hr.spacer {

app/javascript/styles/mastodon/components.scss

@@ -4099,11 +4099,10 @@ a.account__display-name {
 .column-subheading {
   background: var(--color-bg-secondary);
   color: var(--color-text-secondary);
-  padding: 8px 20px;
-  font-size: 12px;
+  padding: 12px 24px;
+  font-size: 13px;
   font-weight: 500;
   text-transform: uppercase;
-  cursor: default;
 }
 
 .getting-started__wrapper {
@@ -10679,6 +10678,7 @@ noscript {
           &__source {
             display: inline-flex;
             align-items: center;
+            max-width: 100%;
             color: var(--color-text-tertiary);
             gap: 4px;
             overflow: hidden;
@@ -10899,12 +10899,6 @@ noscript {
     color: var(--color-text-secondary);
   }
 
-  & > span {
-    display: flex;
-    align-items: center;
-    gap: 8px;
-  }
-
   a {
     display: inline-flex;
     align-items: center;