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

Remove line-height declarations from _ReplyTile.scss #8932

Merged
merged 7 commits into from
Jun 29, 2022
Merged

Remove line-height declarations from _ReplyTile.scss #8932

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
d3146ab
Set line-height for ReplyTile on IRC, modern, and bubble layout
luixxiul Jun 27, 2022
0f832e1
Move line-height style block to _EventTile.scss
luixxiul Jun 29, 2022
523a60b
Move line-height style block to _EventTile.scss
luixxiul Jun 29, 2022
c92899e
Revert "Move line-height style block to _EventTile.scss"
luixxiul Jun 29, 2022
a9b110c
Revert "Move line-height style block to _EventTile.scss"
luixxiul Jun 29, 2022
014bb44
Revert "Set line-height for ReplyTile on IRC, modern, and bubble layout"
luixxiul Jun 29, 2022
9f0c89b
Remove line-height declarations to let inherited values used
luixxiul Jun 29, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion res/css/views/rooms/_EventTile.scss
View file
Open in desktop
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);
robintown marked this conversation as resolved.
Show resolved Hide resolved
}

.mx_EventTile_e2eIcon {
Expand Down
5 changes: 1 addition & 4 deletions res/css/views/rooms/_ReplyTile.scss
View file
Open in desktop
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)
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think var(--EventTile_group_line-line-height) should be kept for future reference about the reason of this line-height specification (it is easy to search if the variable is available).

font-size: $font-14px !important; // Override the big emoji override
}

Expand Down