diff --git a/playwright/snapshots/left-panel/room-list-panel/room-list-panel.spec.ts/room-list-panel-smallscreen-linux.png b/playwright/snapshots/left-panel/room-list-panel/room-list-panel.spec.ts/room-list-panel-smallscreen-linux.png index 03efec8ca5..92b81245a2 100644 Binary files a/playwright/snapshots/left-panel/room-list-panel/room-list-panel.spec.ts/room-list-panel-smallscreen-linux.png and b/playwright/snapshots/left-panel/room-list-panel/room-list-panel.spec.ts/room-list-panel-smallscreen-linux.png differ diff --git a/playwright/snapshots/left-panel/room-list-panel/room-list.spec.ts/room-list-item-open-more-options-linux.png b/playwright/snapshots/left-panel/room-list-panel/room-list.spec.ts/room-list-item-open-more-options-linux.png index c8ae8313fa..99bb312695 100644 Binary files a/playwright/snapshots/left-panel/room-list-panel/room-list.spec.ts/room-list-item-open-more-options-linux.png and b/playwright/snapshots/left-panel/room-list-panel/room-list.spec.ts/room-list-item-open-more-options-linux.png differ diff --git a/playwright/snapshots/left-panel/room-list-panel/room-list.spec.ts/room-list-item-open-notification-options-linux.png b/playwright/snapshots/left-panel/room-list-panel/room-list.spec.ts/room-list-item-open-notification-options-linux.png index e10bce4273..c91ebf3b3a 100644 Binary files a/playwright/snapshots/left-panel/room-list-panel/room-list.spec.ts/room-list-item-open-notification-options-linux.png and b/playwright/snapshots/left-panel/room-list-panel/room-list.spec.ts/room-list-item-open-notification-options-linux.png differ diff --git a/playwright/snapshots/left-panel/room-list-panel/room-list.spec.ts/room-list-item-open-notification-options-selection-linux.png b/playwright/snapshots/left-panel/room-list-panel/room-list.spec.ts/room-list-item-open-notification-options-selection-linux.png index e415eb899f..4b3ac052ca 100644 Binary files a/playwright/snapshots/left-panel/room-list-panel/room-list.spec.ts/room-list-item-open-notification-options-selection-linux.png and b/playwright/snapshots/left-panel/room-list-panel/room-list.spec.ts/room-list-item-open-notification-options-selection-linux.png differ diff --git a/res/css/structures/_SpacePanel.pcss b/res/css/structures/_SpacePanel.pcss index 3436e5b3a7..64044c4c5c 100644 --- a/res/css/structures/_SpacePanel.pcss +++ b/res/css/structures/_SpacePanel.pcss @@ -30,6 +30,11 @@ Please see LICENSE files in the repository root for full details. width: 68px; } + &.newUi { + background-color: var(--cpd-color-bg-canvas-default); + border-right: 1px solid var(--cpd-color-bg-subtle-primary); + } + .mx_SpacePanel_toggleCollapse { position: absolute; width: 18px; @@ -399,6 +404,11 @@ Please see LICENSE files in the repository root for full details. display: block; } } + + &.newUi .mx_UserMenu { + margin-top: var(--cpd-space-4x); + border-bottom: none; + } } .mx_SpacePanel_contextMenu { diff --git a/src/components/structures/LoggedInView.tsx b/src/components/structures/LoggedInView.tsx index b4f65b9871..26e127f21f 100644 --- a/src/components/structures/LoggedInView.tsx +++ b/src/components/structures/LoggedInView.tsx @@ -724,9 +724,11 @@ class LoggedInView extends React.Component {
- + {!useNewRoomList && ( + + )} - + {!useNewRoomList && }
{ } }); + const newRoomListEnabled = useSettingValue("feature_new_room_list"); + return ( {({ onKeyDownHandler, onDragEndHandler }) => ( @@ -378,7 +380,10 @@ const SpacePanel: React.FC = () => { }} >