From 4ce32fe58c209ea8ccdf9d2f6f78552113d1c8c4 Mon Sep 17 00:00:00 2001 From: Kerry Archibald Date: Tue, 14 Nov 2023 12:34:00 +1300 Subject: [PATCH 1/2] Room header: do not collapse avatar or facepile --- res/css/structures/_RightPanel.pcss | 1 + res/css/views/rooms/_RoomHeader.pcss | 8 ++++++++ 2 files changed, 9 insertions(+) diff --git a/res/css/structures/_RightPanel.pcss b/res/css/structures/_RightPanel.pcss index 55c95c30644..19d512fb653 100644 --- a/res/css/structures/_RightPanel.pcss +++ b/res/css/structures/_RightPanel.pcss @@ -25,6 +25,7 @@ limitations under the License. box-sizing: border-box; height: 100%; contain: strict; + background-color: var(--cpd-color-bg-canvas-default); .mx_RoomView_MessageList { padding: 14px 18px; /* top and bottom is 4px smaller to balance with the padding set above */ diff --git a/res/css/views/rooms/_RoomHeader.pcss b/res/css/views/rooms/_RoomHeader.pcss index a1ee36f33c1..a9e5e989cf2 100644 --- a/res/css/views/rooms/_RoomHeader.pcss +++ b/res/css/views/rooms/_RoomHeader.pcss @@ -83,8 +83,16 @@ limitations under the License. cursor: pointer; user-select: none; + > div { + flex-shrink: 0; + } + &:hover { color: $primary-content; background: var(--cpd-color-bg-subtle-primary); } } + +.mx_RoomHeader .mx_BaseAvatar { + flex-shrink: 0; +} From 05ec2f820c123cdb42342084ff86278107fede5d Mon Sep 17 00:00:00 2001 From: Kerry Archibald Date: Tue, 14 Nov 2023 12:37:42 +1300 Subject: [PATCH 2/2] comment --- res/css/views/rooms/_RoomHeader.pcss | 3 +++ 1 file changed, 3 insertions(+) diff --git a/res/css/views/rooms/_RoomHeader.pcss b/res/css/views/rooms/_RoomHeader.pcss index a9e5e989cf2..d0aaf39c4ad 100644 --- a/res/css/views/rooms/_RoomHeader.pcss +++ b/res/css/views/rooms/_RoomHeader.pcss @@ -83,6 +83,9 @@ limitations under the License. cursor: pointer; user-select: none; + /* RoomAvatar doesn't pass classes down to avatar + So set style here + using div because compound classes are not stable */ > div { flex-shrink: 0; }