diff --git a/element-web b/element-web index cacb1a60..1ff5a6c4 160000 --- a/element-web +++ b/element-web @@ -1 +1 @@ -Subproject commit cacb1a60db7dc15ee7cb9827e0bf83d308bc4baa +Subproject commit 1ff5a6c421fd9f49b131d7c7ea4a0e6d7f257d7b diff --git a/patches/element-web/0031-Improve-IRC-layout-for-SchildiChat.patch b/patches/element-web/0031-Improve-IRC-layout-for-SchildiChat.patch index e28c3681..29c66a06 100644 --- a/patches/element-web/0031-Improve-IRC-layout-for-SchildiChat.patch +++ b/patches/element-web/0031-Improve-IRC-layout-for-SchildiChat.patch @@ -1,14 +1,25 @@ -From 18578fe4ac6838b2d70a4efb029a75ab24087dab Mon Sep 17 00:00:00 2001 +From a5e5f36ce4117bdb72da63e1ed30b55602bec2d2 Mon Sep 17 00:00:00 2001 From: Suguru Hirahara Date: Thu, 31 Oct 2024 13:44:20 -0400 Subject: Improve IRC layout for SchildiChat Signed-off-by: Suguru Hirahara + +Squashed: + +Author: Suguru Hirahara +Date: Thu Nov 28 10:01:43 2024 -0500 + + Improve IRC layout for SchildiChat: fix placement of capital letters inside read receipts + + This is a follow-up to 18578fe4ac6838b2d70a4efb029a75ab24087dab. + + Signed-off-by: Suguru Hirahara --- .../elements/_GenericEventListSummary.pcss | 15 ++ - res/css/views/rooms/_EventTile.pcss | 146 ++++++++++++++++-- + res/css/views/rooms/_EventTile.pcss | 148 ++++++++++++++++-- res/css/views/rooms/_IRCLayout.pcss | 2 + - 3 files changed, 153 insertions(+), 10 deletions(-) + 3 files changed, 155 insertions(+), 10 deletions(-) diff --git a/res/css/views/elements/_GenericEventListSummary.pcss b/res/css/views/elements/_GenericEventListSummary.pcss index c13f819439..4f42040606 100644 @@ -43,7 +54,7 @@ index c13f819439..4f42040606 100644 margin-top: $spacing-8; } diff --git a/res/css/views/rooms/_EventTile.pcss b/res/css/views/rooms/_EventTile.pcss -index 311e059166..501a9210cf 100644 +index 311e059166..ecd1030749 100644 --- a/res/css/views/rooms/_EventTile.pcss +++ b/res/css/views/rooms/_EventTile.pcss @@ -1,5 +1,6 @@ @@ -120,7 +131,7 @@ index 311e059166..501a9210cf 100644 } &:hover { -@@ -343,17 +378,66 @@ $left-gutter: 64px; +@@ -343,17 +378,68 @@ $left-gutter: 64px; display: inline; background-color: $event-selected-color; border-radius: 8px 0 0 8px; @@ -143,6 +154,7 @@ index 311e059166..501a9210cf 100644 + .mx_BaseAvatar > * { + height: $font-14px !important; + width: $font-14px !important; ++ line-height: $font-14px; /* override wildcard; fix alignment of capital letter inside read receipts */ + flex-shrink: 0; /* Prevents the avatar from shrinking (when mx_DisambiguatedProfile_displayName is long) */ + } + @@ -153,6 +165,7 @@ index 311e059166..501a9210cf 100644 + .mx_BaseAvatar > * { + height: $font-16px !important; /* override the value specified above */ + width: $font-16px !important; /* override the value specified above */ ++ line-height: $font-16px; /* override wildcard; fix alignment of capital letter inside read receipts */ + } + } + @@ -189,7 +202,7 @@ index 311e059166..501a9210cf 100644 .mx_EventTile_e2eIcon { padding: 0; flex-grow: 0; -@@ -365,9 +449,8 @@ $left-gutter: 64px; +@@ -365,9 +451,8 @@ $left-gutter: 64px; .mx_TextualEvent, .mx_ViewSourceEvent, .mx_MTextBody { @@ -201,7 +214,7 @@ index 311e059166..501a9210cf 100644 } .mx_EventTile_e2eIcon, -@@ -405,8 +488,36 @@ $left-gutter: 64px; +@@ -405,8 +490,36 @@ $left-gutter: 64px; } } @@ -240,7 +253,7 @@ index 311e059166..501a9210cf 100644 } .mx_MessageTimestamp { -@@ -459,8 +570,14 @@ $left-gutter: 64px; +@@ -459,8 +572,14 @@ $left-gutter: 64px; &.mx_EventTile_emote { .mx_EventTile_avatar { @@ -257,7 +270,7 @@ index 311e059166..501a9210cf 100644 } } -@@ -642,6 +759,15 @@ $left-gutter: 64px; +@@ -642,6 +761,15 @@ $left-gutter: 64px; var(--name-width) + var(--icon-width) + var(--MessageTimestamp-width) + 2 * var(--right-padding) ); }