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

2025-01-09 13:20:56 +09:00 · 2025-01-09 13:20:56 +09:00 · d35fa72842
commit d35fa72842
parent 088207ae9f 3c7f3b190c
333 changed files with 4444 additions and 2541 deletions
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@ -1610,7 +1610,7 @@ body > [data-popper-placement] {
  padding: 0 10px;

  .detailed-status__display-name {
-    color: lighten($inverted-text-color, 16%);
+    color: $dark-text-color;

    span {
      display: inline;
--- a/app/javascript/styles/mastodon/forms.scss
+++ b/app/javascript/styles/mastodon/forms.scss
@ -671,6 +671,10 @@ code {
      }
    }
  }
+
+  .status-card {
+    contain: unset;
+  }
 }

 .block-icon {