From 9c0d2080f2115c4e22bf9ae89dffdc7f1ae7986c Mon Sep 17 00:00:00 2001 From: Suguru Hirahara Date: Wed, 29 Jun 2022 18:28:47 +0000 Subject: [PATCH] Remove line-height declarations from _ReplyTile.scss (#8932) * Set line-height for ReplyTile on IRC, modern, and bubble layout Signed-off-by: Suguru Hirahara * Move line-height style block to _EventTile.scss Signed-off-by: Suguru Hirahara * Move line-height style block to _EventTile.scss Signed-off-by: Suguru Hirahara * Revert "Move line-height style block to _EventTile.scss" This reverts commit 523a60b17afd849556296b43e60c6e02768e8d8f. Signed-off-by: Suguru Hirahara * Revert "Move line-height style block to _EventTile.scss" This reverts commit 0f832e19e8c6a42b885f38adb40caeb08361d0e7. Signed-off-by: Suguru Hirahara * Revert "Set line-height for ReplyTile on IRC, modern, and bubble layout" This reverts commit d3146ab49756a32b43f48d8ec3665eb74c955a01. Signed-off-by: Suguru Hirahara * Remove line-height declarations to let inherited values used Signed-off-by: Suguru Hirahara --- res/css/views/rooms/_EventTile.scss | 4 +++- res/css/views/rooms/_ReplyTile.scss | 5 +---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/res/css/views/rooms/_EventTile.scss b/res/css/views/rooms/_EventTile.scss index facf904616..90c5809af8 100644 --- a/res/css/views/rooms/_EventTile.scss +++ b/res/css/views/rooms/_EventTile.scss @@ -99,6 +99,8 @@ $threadInfoLineHeight: calc(2 * $font-12px); // See: _commons.scss } &[data-layout=group] { + --EventTile_group_line-line-height: $font-22px; + > .mx_DisambiguatedProfile { line-height: $font-20px; margin-left: $left-gutter; @@ -124,7 +126,7 @@ $threadInfoLineHeight: calc(2 * $font-12px); // See: _commons.scss padding-top: 1px; padding-bottom: 3px; padding-left: $left-gutter; - line-height: $font-22px; + line-height: var(--EventTile_group_line-line-height); } .mx_EventTile_e2eIcon { diff --git a/res/css/views/rooms/_ReplyTile.scss b/res/css/views/rooms/_ReplyTile.scss index fe8e5bce48..3c78265813 100644 --- a/res/css/views/rooms/_ReplyTile.scss +++ b/res/css/views/rooms/_ReplyTile.scss @@ -18,7 +18,6 @@ limitations under the License. position: relative; padding: 2px 0; font-size: $font-14px; - line-height: $font-16px; &.mx_ReplyTile_audio .mx_MFileBody_info_icon::before { mask-image: url("$(res)/img/element-icons/speaker.svg"); @@ -60,16 +59,14 @@ limitations under the License. // We do reply size limiting with CSS to avoid duplicating the TextualBody component. .mx_EventTile_content { $reply-lines: 2; - $line-height: $font-22px; text-overflow: ellipsis; display: -webkit-box; -webkit-box-orient: vertical; -webkit-line-clamp: $reply-lines; - line-height: $line-height; .mx_EventTile_body.mx_EventTile_bigEmoji { - line-height: $line-height !important; + line-height: $font-22px !important; // Same as var(--EventTile_group_line-line-height) font-size: $font-14px !important; // Override the big emoji override }