From 544c3fbfc040081db9d9f2c8c49a224e2b135408 Mon Sep 17 00:00:00 2001 From: Suguru Hirahara Date: Wed, 18 May 2022 14:53:21 +0900 Subject: [PATCH 1/2] Add padding-right to EventTile_line in EventTile_info on TimelineCard Also ensure the same padding values are applied to EventTile_line on TimelineCard. Signed-off-by: Suguru Hirahara --- res/css/views/right_panel/_TimelineCard.scss | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/res/css/views/right_panel/_TimelineCard.scss b/res/css/views/right_panel/_TimelineCard.scss index 6b4c0d23610..5b26815e552 100644 --- a/res/css/views/right_panel/_TimelineCard.scss +++ b/res/css/views/right_panel/_TimelineCard.scss @@ -54,9 +54,13 @@ limitations under the License. .mx_EventTile:not([data-layout="bubble"]) { $left-gutter: 36px; - .mx_EventTile_line { + .mx_EventTile_line, + &.mx_EventTile_info .mx_EventTile_line { padding-inline-start: $left-gutter; padding-inline-end: 36px; + } + + .mx_EventTile_line { padding-top: var(--BaseCard_EventTile_line-padding-block); padding-bottom: var(--BaseCard_EventTile_line-padding-block); @@ -100,10 +104,6 @@ limitations under the License. } &.mx_EventTile_info { - .mx_EventTile_line { - padding-left: $left-gutter; - } - .mx_EventTile_avatar { left: 18px; } From f9c8ba953d8ab5719e01192facf83a53e722cb53 Mon Sep 17 00:00:00 2001 From: Suguru Hirahara Date: Wed, 18 May 2022 23:10:45 +0900 Subject: [PATCH 2/2] Remove git diff Signed-off-by: Suguru Hirahara --- res/css/views/right_panel/_TimelineCard.scss | 7 ------- 1 file changed, 7 deletions(-) diff --git a/res/css/views/right_panel/_TimelineCard.scss b/res/css/views/right_panel/_TimelineCard.scss index 5110feb849a..e73c4c82ce7 100644 --- a/res/css/views/right_panel/_TimelineCard.scss +++ b/res/css/views/right_panel/_TimelineCard.scss @@ -96,13 +96,6 @@ limitations under the License. } &.mx_EventTile_info { -<<<<<<< HEAD -======= - .mx_EventTile_line { - padding-left: var(--BaseCard_EventTile-spacing-horizontal); - } - ->>>>>>> develop .mx_EventTile_avatar { left: 18px; }