From 0b3a44ea8eb031c28494859538d1d680a24b5887 Mon Sep 17 00:00:00 2001
From: Echo <ChaosExAnima@users.noreply.github.com>
Date: Fri, 18 Sep 2026 11:28:42 +0000
Subject: [PATCH] Status redesign: Fix reply display bugs (#40584)

---
 .../components/status/prepend.module.scss     | 13 +++++++----
 .../mastodon/components/status/prepend.tsx    | 23 +++++++++++--------
 .../components/status/styles.module.scss      |  7 ++++--
 3 files changed, 27 insertions(+), 16 deletions(-)

diff --git a/app/javascript/mastodon/components/status/prepend.module.scss b/app/javascript/mastodon/components/status/prepend.module.scss
index 8b5676c5149..2ae2d798e71 100644
--- a/app/javascript/mastodon/components/status/prepend.module.scss
+++ b/app/javascript/mastodon/components/status/prepend.module.scss
@@ -5,7 +5,6 @@
 
   display: grid;
   grid-template-columns: subgrid;
-  grid-template-rows: 1fr;
   align-items: center;
   color: var(--color-text-secondary);
   grid-column: span 2;
@@ -54,9 +53,13 @@ a.account {
   color: var(--color-text-primary);
 }
 
-.text {
-  @include mixins.line-clamp(1);
-
-  display: block;
+.text blockquote {
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  overflow: hidden;
   margin-block-start: var(--space-1);
+
+  > p {
+    display: inline;
+  }
 }
diff --git a/app/javascript/mastodon/components/status/prepend.tsx b/app/javascript/mastodon/components/status/prepend.tsx
index 188225e4d1f..e540bf7bfc9 100644
--- a/app/javascript/mastodon/components/status/prepend.tsx
+++ b/app/javascript/mastodon/components/status/prepend.tsx
@@ -101,6 +101,9 @@ const StatusPrependReply: React.FC<{ replyId: string }> = ({ replyId }) => {
   };
 
   const language = status.translation?.language ?? status.language;
+  const content = (
+    status.translation?.contentHtml ?? status.contentHtml
+  ).trim();
 
   return (
     <div className={classes.root}>
@@ -120,15 +123,17 @@ const StatusPrependReply: React.FC<{ replyId: string }> = ({ replyId }) => {
           </Link>
         </span>
 
-        <Link to={statusLink(status)} className={classes.text}>
-          <EmojiHTML
-            as='blockquote'
-            lang={language}
-            htmlString={status.translation?.contentHtml ?? status.contentHtml}
-            extraEmojis={status.emojis}
-            onElement={onStatusLinksDisabled}
-          />
-        </Link>
+        {!!content && (
+          <Link to={statusLink(status)} className={classes.text}>
+            <EmojiHTML
+              as='blockquote'
+              lang={language}
+              htmlString={content}
+              extraEmojis={status.emojis}
+              onElement={onStatusLinksDisabled}
+            />
+          </Link>
+        )}
       </div>
     </div>
   );
diff --git a/app/javascript/mastodon/components/status/styles.module.scss b/app/javascript/mastodon/components/status/styles.module.scss
index 7fd3d9a0369..d8a3c3145f1 100644
--- a/app/javascript/mastodon/components/status/styles.module.scss
+++ b/app/javascript/mastodon/components/status/styles.module.scss
@@ -3,11 +3,14 @@
 .root {
   --col-gap: var(--space-2);
   --avatar-size: 40px;
+  --first-col-width: calc(var(--avatar-size) + var(--col-gap));
   --content-col: 2;
 
   display: grid;
-  grid-template-columns: calc(var(--avatar-size) + var(--col-gap)) auto;
-  grid-template-rows: minmax(calc(var(--avatar-size) + var(--col-gap)), auto);
+  grid-template-columns: var(--first-col-width) minmax(
+      calc(100% - var(--first-col-width)),
+      1fr
+    );
   grid-auto-rows: auto;
   row-gap: var(--space-2);
   padding: var(--space-4);