From 03d0ef41cf949fd0ba9fc80e13e131ba0f27b633 Mon Sep 17 00:00:00 2001 From: Suguru Hirahara Date: Sat, 25 Jun 2022 12:36:07 +0900 Subject: [PATCH 1/3] Move mx_ThreadSummary out of ':not([data-layout=bubble])' Signed-off-by: Suguru Hirahara --- res/css/views/rooms/_EventTile.scss | 5 ++++- res/css/views/rooms/_IRCLayout.scss | 5 ----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/res/css/views/rooms/_EventTile.scss b/res/css/views/rooms/_EventTile.scss index d531f3932b4..a5101671e63 100644 --- a/res/css/views/rooms/_EventTile.scss +++ b/res/css/views/rooms/_EventTile.scss @@ -94,6 +94,10 @@ $threadInfoLineHeight: calc(2 * $font-12px); // See: _commons.scss padding-bottom: 3px; line-height: $font-22px; } + + .mx_ThreadSummary { + margin-left: 64px; + } } } @@ -104,7 +108,6 @@ $threadInfoLineHeight: calc(2 * $font-12px); // See: _commons.scss font-size: $font-14px; position: relative; - .mx_ThreadSummary, .mx_ThreadSummaryIcon { margin-left: 64px; } diff --git a/res/css/views/rooms/_IRCLayout.scss b/res/css/views/rooms/_IRCLayout.scss index cd481b2ee34..538ecb5f14c 100644 --- a/res/css/views/rooms/_IRCLayout.scss +++ b/res/css/views/rooms/_IRCLayout.scss @@ -39,11 +39,6 @@ $irc-line-height: $font-18px; margin-right: $right-padding; } - .mx_ThreadSummary { - margin-right: 0; - margin-left: 0; - } - > .mx_EventTile_msgOption { order: 5; flex-shrink: 0; From 121f7a8bd1911485e1981f3291a6a15047015caf Mon Sep 17 00:00:00 2001 From: Suguru Hirahara Date: Sat, 25 Jun 2022 12:40:28 +0900 Subject: [PATCH 2/3] Move mx_ThreadSummaryIcon out of ':not([data-layout=bubble])' for search result panel on IRC layout Signed-off-by: Suguru Hirahara --- res/css/views/rooms/_EventTile.scss | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/res/css/views/rooms/_EventTile.scss b/res/css/views/rooms/_EventTile.scss index a5101671e63..6911837ef91 100644 --- a/res/css/views/rooms/_EventTile.scss +++ b/res/css/views/rooms/_EventTile.scss @@ -95,7 +95,8 @@ $threadInfoLineHeight: calc(2 * $font-12px); // See: _commons.scss line-height: $font-22px; } - .mx_ThreadSummary { + .mx_ThreadSummary, + .mx_ThreadSummaryIcon { margin-left: 64px; } } @@ -108,10 +109,6 @@ $threadInfoLineHeight: calc(2 * $font-12px); // See: _commons.scss font-size: $font-14px; position: relative; - .mx_ThreadSummaryIcon { - margin-left: 64px; - } - .mx_EventTile_avatar { top: 14px; left: 8px; From 79937a0c2a2b500e4642654c2971d69241baf058 Mon Sep 17 00:00:00 2001 From: Suguru Hirahara Date: Sat, 25 Jun 2022 12:41:11 +0900 Subject: [PATCH 3/3] Use a variable Signed-off-by: Suguru Hirahara --- res/css/views/rooms/_EventTile.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/res/css/views/rooms/_EventTile.scss b/res/css/views/rooms/_EventTile.scss index 6911837ef91..fb015b4dacd 100644 --- a/res/css/views/rooms/_EventTile.scss +++ b/res/css/views/rooms/_EventTile.scss @@ -97,7 +97,7 @@ $threadInfoLineHeight: calc(2 * $font-12px); // See: _commons.scss .mx_ThreadSummary, .mx_ThreadSummaryIcon { - margin-left: 64px; + margin-left: $left-gutter; } } }