From 727afdc33a4d9afb5877224f5bb2cd078f19389b Mon Sep 17 00:00:00 2001
From: Suguru Hirahara <luixxiul@users.noreply.github.com>
Date: Mon, 6 Mar 2023 09:19:38 +0000
Subject: [PATCH] Reduce bottom margin of ReplyChain on compact modern layout
 (#8972)

---
 res/css/views/elements/_ReplyChain.pcss |  2 +-
 res/css/views/rooms/_EventTile.pcss     | 12 ++++++++++++
 res/css/views/rooms/_IRCLayout.pcss     |  1 -
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/res/css/views/elements/_ReplyChain.pcss b/res/css/views/elements/_ReplyChain.pcss
index 0033446600..090a0bcbe8 100644
--- a/res/css/views/elements/_ReplyChain.pcss
+++ b/res/css/views/elements/_ReplyChain.pcss
@@ -15,7 +15,7 @@ limitations under the License.
 */
 
 .mx_ReplyChain {
-    margin: 0 0 $spacing-8 0;
+    margin: 0; // Reset default blockquote margin
     padding-left: 10px; // TODO: Use a spacing variable
     border-left: 2px solid var(--username-color); // TODO: Use a spacing variable
     border-radius: 2px; // TODO: Use a spacing variable
diff --git a/res/css/views/rooms/_EventTile.pcss b/res/css/views/rooms/_EventTile.pcss
index bb608e8594..14c7107439 100644
--- a/res/css/views/rooms/_EventTile.pcss
+++ b/res/css/views/rooms/_EventTile.pcss
@@ -267,6 +267,10 @@ $left-gutter: 64px;
         .mx_EventTileBubble {
             margin-inline: auto;
         }
+
+        .mx_ReplyChain {
+            margin-bottom: $spacing-8;
+        }
     }
 
     &[data-layout="irc"] {
@@ -295,6 +299,10 @@ $left-gutter: 64px;
             }
         }
 
+        .mx_ReplyChain {
+            margin: 0;
+        }
+
         .mx_ReplyTile .mx_EventTileBubble {
             left: unset; /* Cancel the value specified above for the tile inside ReplyTile */
         }
@@ -1244,6 +1252,10 @@ $left-gutter: 64px;
                 padding-block: var(--MatrixChat_useCompactLayout_line-spacing-block);
             }
 
+            .mx_ReplyChain {
+                margin-bottom: $spacing-4;
+            }
+
             &.mx_EventTile_info {
                 padding-top: 0; /* same as the padding for non-compact .mx_EventTile.mx_EventTile_info */
                 font-size: $font-13px;
diff --git a/res/css/views/rooms/_IRCLayout.pcss b/res/css/views/rooms/_IRCLayout.pcss
index 84b15ccd38..ed27991839 100644
--- a/res/css/views/rooms/_IRCLayout.pcss
+++ b/res/css/views/rooms/_IRCLayout.pcss
@@ -183,7 +183,6 @@ $irc-line-height: $font-18px;
     }
 
     .mx_ReplyChain {
-        margin: 0;
         .mx_DisambiguatedProfile {
             order: unset;
             width: unset;