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

Commit

Permalink
Remove line-height declarations from _ReplyTile.scss (#8932)
Browse files Browse the repository at this point in the history
* Set line-height for ReplyTile on IRC, modern, and bubble layout

Signed-off-by: Suguru Hirahara <luixxiul@users.noreply.github.com>

* Move line-height style block to _EventTile.scss

Signed-off-by: Suguru Hirahara <luixxiul@users.noreply.github.com>

* Move line-height style block to _EventTile.scss

Signed-off-by: Suguru Hirahara <luixxiul@users.noreply.github.com>

* Revert "Move line-height style block to _EventTile.scss"

This reverts commit 523a60b.

Signed-off-by: Suguru Hirahara <luixxiul@users.noreply.github.com>

* Revert "Move line-height style block to _EventTile.scss"

This reverts commit 0f832e1.

Signed-off-by: Suguru Hirahara <luixxiul@users.noreply.github.com>

* Revert "Set line-height for ReplyTile on IRC, modern, and bubble layout"

This reverts commit d3146ab.

Signed-off-by: Suguru Hirahara <luixxiul@users.noreply.github.com>

* Remove line-height declarations to let inherited values used

Signed-off-by: Suguru Hirahara <luixxiul@users.noreply.github.com>
  • Loading branch information
luixxiul authored Jun 29, 2022
1 parent 68c94c6 commit 9c0d208
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 5 deletions.
4 changes: 3 additions & 1 deletion res/css/views/rooms/_EventTile.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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 {
Expand Down
5 changes: 1 addition & 4 deletions res/css/views/rooms/_ReplyTile.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand Down Expand Up @@ -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
}

Expand Down

0 comments on commit 9c0d208

Please sign in to comment.