OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Remove line-height declarations from _ReplyTile.scss (#8932) 

* 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 523a60b17afd849556296b43e60c6e02768e8d8f.

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

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

This reverts commit 0f832e19e8c6a42b885f38adb40caeb08361d0e7.

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 d3146ab49756a32b43f48d8ec3665eb74c955a01.

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>
pull/28788/head^2
Suguru Hirahara 2022-06-29 18:28:47 +00:00 committed by GitHub
parent 68c94c6400
commit 9c0d2080f2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
res/css/views/rooms/_EventTile.scss
View File

@ -99,6 +99,8 @@ $threadInfoLineHeight: calc(2 * $font-12px); // See: _commons.scss
} }
&[data-layout=group] { &[data-layout=group] {
--EventTile_group_line-line-height: $font-22px;
> .mx_DisambiguatedProfile { > .mx_DisambiguatedProfile {
line-height: $font-20px; line-height: $font-20px;
margin-left: $left-gutter; margin-left: $left-gutter;
@ -124,7 +126,7 @@ $threadInfoLineHeight: calc(2 * $font-12px); // See: _commons.scss
padding-top: 1px; padding-top: 1px;
padding-bottom: 3px; padding-bottom: 3px;
padding-left: $left-gutter; padding-left: $left-gutter;
line-height: $font-22px; line-height: var(--EventTile_group_line-line-height);
} }
.mx_EventTile_e2eIcon { .mx_EventTile_e2eIcon {

5
res/css/views/rooms/_ReplyTile.scss
View File

@ -18,7 +18,6 @@ limitations under the License.
position: relative; position: relative;
padding: 2px 0; padding: 2px 0;
font-size: $font-14px; font-size: $font-14px;
line-height: $font-16px;
&.mx_ReplyTile_audio .mx_MFileBody_info_icon::before { &.mx_ReplyTile_audio .mx_MFileBody_info_icon::before {
mask-image: url("$(res)/img/element-icons/speaker.svg"); 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. // We do reply size limiting with CSS to avoid duplicating the TextualBody component.
.mx_EventTile_content { .mx_EventTile_content {
$reply-lines: 2; $reply-lines: 2;
$line-height: $font-22px;
text-overflow: ellipsis; text-overflow: ellipsis;
display: -webkit-box; display: -webkit-box;
-webkit-box-orient: vertical; -webkit-box-orient: vertical;
-webkit-line-clamp: $reply-lines; -webkit-line-clamp: $reply-lines;
line-height: $line-height;
.mx_EventTile_body.mx_EventTile_bigEmoji { .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 font-size: $font-14px !important; // Override the big emoji override
} }