Skip to content
This repository was archived by the owner on Sep 11, 2024. It is now read-only.

Commit 9c0d208

Browse files
authored
Remove line-height declarations from _ReplyTile.scss (#8932)
* Set line-height for ReplyTile on IRC, modern, and bubble layout Signed-off-by: Suguru Hirahara <[email protected]> * Move line-height style block to _EventTile.scss Signed-off-by: Suguru Hirahara <[email protected]> * Move line-height style block to _EventTile.scss Signed-off-by: Suguru Hirahara <[email protected]> * Revert "Move line-height style block to _EventTile.scss" This reverts commit 523a60b. Signed-off-by: Suguru Hirahara <[email protected]> * Revert "Move line-height style block to _EventTile.scss" This reverts commit 0f832e1. Signed-off-by: Suguru Hirahara <[email protected]> * Revert "Set line-height for ReplyTile on IRC, modern, and bubble layout" This reverts commit d3146ab. Signed-off-by: Suguru Hirahara <[email protected]> * Remove line-height declarations to let inherited values used Signed-off-by: Suguru Hirahara <[email protected]>
1 parent 68c94c6 commit 9c0d208

File tree

2 files changed

+4
-5
lines changed

2 files changed

+4
-5
lines changed

res/css/views/rooms/_EventTile.scss

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,8 @@ $threadInfoLineHeight: calc(2 * $font-12px); // See: _commons.scss
9999
}
100100

101101
&[data-layout=group] {
102+
--EventTile_group_line-line-height: $font-22px;
103+
102104
> .mx_DisambiguatedProfile {
103105
line-height: $font-20px;
104106
margin-left: $left-gutter;
@@ -124,7 +126,7 @@ $threadInfoLineHeight: calc(2 * $font-12px); // See: _commons.scss
124126
padding-top: 1px;
125127
padding-bottom: 3px;
126128
padding-left: $left-gutter;
127-
line-height: $font-22px;
129+
line-height: var(--EventTile_group_line-line-height);
128130
}
129131

130132
.mx_EventTile_e2eIcon {

res/css/views/rooms/_ReplyTile.scss

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ limitations under the License.
1818
position: relative;
1919
padding: 2px 0;
2020
font-size: $font-14px;
21-
line-height: $font-16px;
2221

2322
&.mx_ReplyTile_audio .mx_MFileBody_info_icon::before {
2423
mask-image: url("$(res)/img/element-icons/speaker.svg");
@@ -60,16 +59,14 @@ limitations under the License.
6059
// We do reply size limiting with CSS to avoid duplicating the TextualBody component.
6160
.mx_EventTile_content {
6261
$reply-lines: 2;
63-
$line-height: $font-22px;
6462

6563
text-overflow: ellipsis;
6664
display: -webkit-box;
6765
-webkit-box-orient: vertical;
6866
-webkit-line-clamp: $reply-lines;
69-
line-height: $line-height;
7067

7168
.mx_EventTile_body.mx_EventTile_bigEmoji {
72-
line-height: $line-height !important;
69+
line-height: $font-22px !important; // Same as var(--EventTile_group_line-line-height)
7370
font-size: $font-14px !important; // Override the big emoji override
7471
}
7572

0 commit comments

Comments
 (0)