From 90c737a0afd4968cbb1e8ce803d9047854e8b0f8 Mon Sep 17 00:00:00 2001 From: Suguru Hirahara Date: Sat, 2 Jul 2022 17:42:59 +0900 Subject: [PATCH 1/4] Reduce bottom margin of ReplyChain on compact modern layout Signed-off-by: Suguru Hirahara --- res/css/views/elements/_ReplyChain.pcss | 2 +- res/css/views/rooms/_EventTile.pcss | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/res/css/views/elements/_ReplyChain.pcss b/res/css/views/elements/_ReplyChain.pcss index 00334466009..090a0bcbe89 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 5425697ff9f..01be85273df 100644 --- a/res/css/views/rooms/_EventTile.pcss +++ b/res/css/views/rooms/_EventTile.pcss @@ -112,6 +112,10 @@ $left-gutter: 64px; gap: $spacing-4; } + .mx_ReplyChain { + margin-bottom: $spacing-8; + } + .mx_ReplyChain--expanded { .mx_EventTile_body { display: block; @@ -1248,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; From c9170850cdfc25857e4086f62f26c29f9d1eecec Mon Sep 17 00:00:00 2001 From: Suguru Hirahara Date: Sat, 2 Jul 2022 17:44:04 +0900 Subject: [PATCH 2/4] Include mx_ReplyChain--expanded Signed-off-by: Suguru Hirahara --- res/css/views/rooms/_EventTile.pcss | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/res/css/views/rooms/_EventTile.pcss b/res/css/views/rooms/_EventTile.pcss index 01be85273df..5d40ff4d65e 100644 --- a/res/css/views/rooms/_EventTile.pcss +++ b/res/css/views/rooms/_EventTile.pcss @@ -114,12 +114,12 @@ $left-gutter: 64px; .mx_ReplyChain { margin-bottom: $spacing-8; - } - .mx_ReplyChain--expanded { - .mx_EventTile_body { - display: block; - overflow-y: scroll; + &.mx_ReplyChain--expanded { + .mx_EventTile_body { + display: block; + overflow-y: scroll; + } } .mx_EventTile_collapsedCodeBlock { From 169f370fbe11a11dc557afc91a650301d648bff8 Mon Sep 17 00:00:00 2001 From: Suguru Hirahara Date: Tue, 5 Jul 2022 02:12:33 +0900 Subject: [PATCH 3/4] Specify declarations on _EventTile.scss Signed-off-by: Suguru Hirahara --- res/css/views/rooms/_EventTile.pcss | 10 ++++++++-- res/css/views/rooms/_IRCLayout.pcss | 1 - 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/res/css/views/rooms/_EventTile.pcss b/res/css/views/rooms/_EventTile.pcss index 5d40ff4d65e..5503a5ccc76 100644 --- a/res/css/views/rooms/_EventTile.pcss +++ b/res/css/views/rooms/_EventTile.pcss @@ -113,8 +113,6 @@ $left-gutter: 64px; } .mx_ReplyChain { - margin-bottom: $spacing-8; - &.mx_ReplyChain--expanded { .mx_EventTile_body { display: block; @@ -271,6 +269,10 @@ $left-gutter: 64px; .mx_EventTileBubble { margin-inline: auto; } + + .mx_ReplyChain { + margin-bottom: $spacing-8; + } } &[data-layout="irc"] { @@ -295,6 +297,10 @@ $left-gutter: 64px; } } + .mx_ReplyChain { + margin: 0; + } + .mx_ReplyTile .mx_EventTileBubble { left: unset; /* Cancel the value specified above for the tile inside ReplyTile */ } diff --git a/res/css/views/rooms/_IRCLayout.pcss b/res/css/views/rooms/_IRCLayout.pcss index 02ae02fa5eb..ba97e3f84ce 100644 --- a/res/css/views/rooms/_IRCLayout.pcss +++ b/res/css/views/rooms/_IRCLayout.pcss @@ -177,7 +177,6 @@ $irc-line-height: $font-18px; } .mx_ReplyChain { - margin: 0; .mx_DisambiguatedProfile { order: unset; width: unset; From 63514dd0facc2b459dc939856590918964361d35 Mon Sep 17 00:00:00 2001 From: Suguru Hirahara Date: Fri, 24 Feb 2023 01:38:34 +0900 Subject: [PATCH 4/4] Remove a wrapper Signed-off-by: Suguru Hirahara --- res/css/views/rooms/_EventTile.pcss | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/res/css/views/rooms/_EventTile.pcss b/res/css/views/rooms/_EventTile.pcss index 5503a5ccc76..3b083ecfee8 100644 --- a/res/css/views/rooms/_EventTile.pcss +++ b/res/css/views/rooms/_EventTile.pcss @@ -112,12 +112,10 @@ $left-gutter: 64px; gap: $spacing-4; } - .mx_ReplyChain { - &.mx_ReplyChain--expanded { - .mx_EventTile_body { - display: block; - overflow-y: scroll; - } + .mx_ReplyChain--expanded { + .mx_EventTile_body { + display: block; + overflow-y: scroll; } .mx_EventTile_collapsedCodeBlock {