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

2024-10-21 07:07:48 +09:00 · 2024-10-21 07:07:48 +09:00 · ab58aed910
commit ab58aed910
parent beaf165c93 1fc165de02
279 changed files with 2761 additions and 1351 deletions
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@ -11256,21 +11256,17 @@ noscript {
      color: $darker-text-color;
      -webkit-line-clamp: 4;
      -webkit-box-orient: vertical;
-      max-height: 4 * 22px;
+      max-height: none;
      overflow: hidden;

-      p {
-        display: none;
-
-        &:first-child {
-          display: initial;
-        }
-      }
-
      p,
      a {
        color: inherit;
      }
+
+      p {
+        margin-bottom: 8px;
+      }
    }

    .reply-indicator__attachments {