Merge remote-tracking branch 'parent/main' into upstream-20241113

app/javascript/styles/mastodon-light/diff.scss

@@ -535,3 +535,10 @@ a.sparkline {
 ::-webkit-scrollbar-thumb {
   opacity: 0.25;
 }
+
+.notification-group--annual-report {
+  .notification-group__icon,
+  .notification-group__main .link-button {
+    color: var(--indigo-3);
+  }
+}

app/javascript/styles/mastodon/annual_reports.scss

@@ -103,6 +103,11 @@
           background-color: var(--goldenrod-2);
         }
       }
+
+      .status-card,
+      .hashtag-bar {
+        display: none;
+      }
     }
 
     &__followers {
@@ -237,7 +242,7 @@
       }
 
       &__number {
-        font-size: 61px;
+        font-size: 54px;
         font-weight: 600;
         line-height: 73px;
         color: var(--goldenrod-2);
@@ -306,7 +311,7 @@
 }
 
 .annual-report-modal {
-  max-width: 480px;
+  max-width: 600px;
   background: var(--indigo-1);
   border-radius: 16px;
   display: flex;