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

2025-03-10 19:58:05 +09:00 · 2025-03-10 19:58:05 +09:00 · 5979c0ea1d
commit 5979c0ea1d
parent 69d5383d1f 207029eb2f
345 changed files with 4304 additions and 2540 deletions
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@ -7731,7 +7731,8 @@ a.status-card {
    border-radius: 0;
  }

-  .load-more {
+  .load-more,
+  .timeline-hint {
    grid-column: span 3;
  }
 }