Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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: 0 additions & 4 deletions docs/labs.md
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,3 @@ Unreliable in encrypted rooms.
## Knock rooms (`feature_ask_to_join`) [In Development]

Enables knock feature for rooms. This allows users to ask to join a room.

## New room list (`feature_new_room_list`) [In Development]

Enable the new room list that is currently in development.
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ test.describe("Room list filters and sort", () => {
displayName: "BotBob",
autoAcceptInvites: true,
},
labsFlags: ["feature_new_room_list"],
});

function getPrimaryFilters(page: Page): Locator {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,6 @@ import { test, expect } from "../../../element-web-test";
import type { Page } from "@playwright/test";

test.describe("Header section of the room list", () => {
test.use({
labsFlags: ["feature_new_room_list"],
});

/**
* Get the header section of the room list
* @param page
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,6 @@ import { type Page } from "@playwright/test";
import { test, expect } from "../../../element-web-test";

test.describe("Room list panel", () => {
test.use({
labsFlags: ["feature_new_room_list"],
});

/**
* Get the room list view
* @param page
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,6 @@ import { type Page } from "@playwright/test";
import { test, expect } from "../../../element-web-test";

test.describe("Search section of the room list", () => {
test.use({
labsFlags: ["feature_new_room_list"],
});

/**
* Get the search section of the room list
* @param page
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ import { expect, test } from "../../../element-web-test";
test.describe("Room list", () => {
test.use({
displayName: "Alice",
labsFlags: ["feature_new_room_list"],
botCreateOpts: {
displayName: "BotBob",
},
Expand Down Expand Up @@ -276,7 +275,7 @@ test.describe("Room list", () => {
});

test.describe("Avatar decoration", () => {
test.use({ labsFlags: ["feature_video_rooms", "feature_new_room_list"] });
test.use({ labsFlags: ["feature_video_rooms"] });

test("should be a public room", { tag: "@screenshot" }, async ({ page, app, user }) => {
// @ts-ignore Visibility enum is not accessible
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ test.describe("Release announcement", () => {
await app.viewRoomById(roomId);
await use({ roomId });
},
labsFlags: ["feature_new_room_list"],
});

test(
Expand Down
5 changes: 0 additions & 5 deletions playwright/e2e/room/room-header.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,6 @@ import { type ElementAppPage } from "../../pages/ElementAppPage";
test.describe("Room Header", () => {
test.use({
displayName: "Sakura",
config: {
features: {
feature_new_room_list: false,
},
},
});

test.describe("with feature_notifications enabled", () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,6 @@ test.describe("Preferences user settings tab", () => {
const locator = await app.settings.openUserSettings("Preferences");
await use(locator);
},
// display message preview settings
labsFlags: ["feature_new_room_list"],
});

test("should be rendered properly", { tag: "@screenshot" }, async ({ app, page, user }) => {
Expand Down
7 changes: 0 additions & 7 deletions res/css/_components.pcss
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,6 @@
@import "./compound/_SuccessDialog.pcss";
@import "./structures/_AutoHideScrollbar.pcss";
@import "./structures/_AutocompleteInput.pcss";
@import "./structures/_BackdropPanel.pcss";
@import "./structures/_CompatibilityPage.pcss";
@import "./structures/_ContextualMenu.pcss";
@import "./structures/_ErrorMessage.pcss";
Expand All @@ -73,7 +72,6 @@
@import "./structures/_NonUrgentToastContainer.pcss";
@import "./structures/_QuickSettingsButton.pcss";
@import "./structures/_RightPanel.pcss";
@import "./structures/_RoomSearch.pcss";
@import "./structures/_RoomStatusBar.pcss";
@import "./structures/_RoomView.pcss";
@import "./structures/_SearchBox.pcss";
Expand Down Expand Up @@ -297,8 +295,6 @@
@import "./views/rooms/_IRCLayout.pcss";
@import "./views/rooms/_InvitedIconView.pcss";
@import "./views/rooms/_JumpToBottomButton.pcss";
@import "./views/rooms/_LegacyRoomList.pcss";
@import "./views/rooms/_LegacyRoomListHeader.pcss";
@import "./views/rooms/_LinkPreviewGroup.pcss";
@import "./views/rooms/_LinkPreviewWidget.pcss";
@import "./views/rooms/_LiveContentSummary.pcss";
Expand All @@ -317,16 +313,13 @@
@import "./views/rooms/_ReadReceiptGroup.pcss";
@import "./views/rooms/_ReplyPreview.pcss";
@import "./views/rooms/_ReplyTile.pcss";
@import "./views/rooms/_RoomBreadcrumbs.pcss";
@import "./views/rooms/_RoomCallBanner.pcss";
@import "./views/rooms/_RoomHeader.pcss";
@import "./views/rooms/_RoomInfoLine.pcss";
@import "./views/rooms/_RoomKnocksBar.pcss";
@import "./views/rooms/_RoomPreviewBar.pcss";
@import "./views/rooms/_RoomPreviewCard.pcss";
@import "./views/rooms/_RoomSearchAuxPanel.pcss";
@import "./views/rooms/_RoomSublist.pcss";
@import "./views/rooms/_RoomTile.pcss";
@import "./views/rooms/_RoomUpgradeWarningBar.pcss";
@import "./views/rooms/_SendMessageComposer.pcss";
@import "./views/rooms/_Stickers.pcss";
Expand Down
1 change: 1 addition & 0 deletions res/css/components/views/spaces/_QuickThemeSwitcher.pcss
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ Please see LICENSE files in the repository root for full details.
.mx_QuickThemeSwitcher {
display: flex;
align-items: center;
margin-top: var(--cpd-space-2x);

.mx_Dropdown {
min-width: 100px;
Expand Down
29 changes: 0 additions & 29 deletions res/css/structures/_BackdropPanel.pcss

This file was deleted.

29 changes: 0 additions & 29 deletions res/css/structures/_LeftPanel.pcss
Original file line number Diff line number Diff line change
Expand Up @@ -110,10 +110,6 @@ Please see LICENSE files in the repository root for full details.
display: flex;
align-items: center;

& + .mx_LegacyRoomListHeader {
margin-top: 12px;
}

.mx_LeftPanel_dialPadButton {
width: 32px;
height: 32px;
Expand Down Expand Up @@ -176,31 +172,6 @@ Please see LICENSE files in the repository root for full details.
mask-image: url("@vector-im/compound-design-tokens/icons/time.svg");
}
}

.mx_LegacyRoomListHeader:first-child {
margin-top: 12px;
}

.mx_LeftPanel_roomListWrapper {
/* Make the y-scrollbar more responsive */
padding-right: 2px;
overflow: hidden;
margin-top: 10px; /* so we're not up against the search/filter */
flex: 1 0 0; /* needed in Safari to properly set flex-basis */

&.mx_LeftPanel_roomListWrapper_stickyBottom {
padding-bottom: 32px;
}

&.mx_LeftPanel_roomListWrapper_stickyTop {
padding-top: 32px;
}
}

.mx_LeftPanel_actualRoomListContainer {
position: relative; /* for sticky headers */
height: 100%; /* ensure scrolling still works */
}
}

/* These styles override the defaults for the minimized (66px) layout */
Expand Down
6 changes: 0 additions & 6 deletions res/css/structures/_QuickSettingsButton.pcss
Original file line number Diff line number Diff line change
Expand Up @@ -110,12 +110,6 @@ Please see LICENSE files in the repository root for full details.
}
}

.mx_QuickSettingsButton_ContextMenuWrapper_new_room_list {
.mx_QuickThemeSwitcher {
margin-top: var(--cpd-space-2x);
}
}

.mx_QuickSettingsButton_icon {
margin-right: var(--cpd-space-1x);
color: $secondary-content;
Expand Down
93 changes: 0 additions & 93 deletions res/css/structures/_RoomSearch.pcss

This file was deleted.

16 changes: 4 additions & 12 deletions res/css/structures/_SpacePanel.pcss
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@ Please see LICENSE files in the repository root for full details.
--height-nested: 24px;
--height-topLevel: 32px;

background-color: $spacePanel-bg-color;
background-color: var(--cpd-color-bg-canvas-default);
border-right: 1px solid var(--cpd-color-bg-subtle-primary);
flex: 0 0 auto;
padding: 0;
margin: 0;
Expand All @@ -30,11 +31,6 @@ 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;
Expand Down Expand Up @@ -397,9 +393,10 @@ Please see LICENSE files in the repository root for full details.
.mx_UserMenu {
padding-bottom: 12px;
border-bottom: 1px solid $separator;
margin: 12px 14px 4px 18px;
margin: var(--cpd-space-4x) 14px 4px 18px;
width: min-content;
max-width: 226px;
border-bottom: none;

/* Display the container and img here as block elements so they don't take
* up extra vertical space.
Expand All @@ -408,11 +405,6 @@ 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 {
Expand Down
4 changes: 0 additions & 4 deletions res/css/views/right_panel/_UserInfo.pcss
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,6 @@ Please see LICENSE files in the repository root for full details.
margin-bottom: $spacing-8;
}

.mx_RoomTile_titleContainer {
width: 154px;
}

.mx_RoomTile_badge {
display: none;
}
Expand Down
Loading
Loading