Merge branch 'develop' into florianduros/pinned-badge-room

Author: florianduros

playwright/e2e/oidc/oidc-native.spec.ts

@@ -8,6 +8,7 @@ Please see LICENSE files in the repository root for full details.
 
 import { test, expect, registerAccountMas } from ".";
 import { isDendrite } from "../../plugins/homeserver/dendrite";
+import { ElementAppPage } from "../../pages/ElementAppPage.ts";
 
 test.describe("OIDC Native", () => {
     test.skip(isDendrite, "does not yet support MAS");
@@ -17,7 +18,7 @@ test.describe("OIDC Native", () => {
         labsFlags: ["feature_oidc_native_flow"],
     });
 
-    test("can register the oauth2 client and an account", async ({ context, page, homeserver, mailhog, app, mas }) => {
+    test("can register the oauth2 client and an account", async ({ context, page, homeserver, mailhog, mas }) => {
         const tokenUri = `http://localhost:${mas.port}/oauth2/token`;
         const tokenApiPromise = page.waitForRequest(
             (request) => request.url() === tokenUri && request.postDataJSON()["grant_type"] === "authorization_code",
@@ -36,6 +37,7 @@ test.describe("OIDC Native", () => {
 
         const deviceId = await page.evaluate<string>(() => window.localStorage.mx_device_id);
 
+        const app = new ElementAppPage(page);
         await app.settings.openUserSettings("Account");
         const newPagePromise = context.waitForEvent("page");
         await page.getByRole("button", { name: "Manage account" }).click();

res/css/_components.pcss

@@ -12,7 +12,6 @@
 @import "./components/views/beacon/_LeftPanelLiveShareWarning.pcss";
 @import "./components/views/beacon/_LiveTimeRemaining.pcss";
 @import "./components/views/beacon/_OwnBeaconStatus.pcss";
-@import "./components/views/beacon/_RoomLiveShareWarning.pcss";
 @import "./components/views/beacon/_ShareLatestLocation.pcss";
 @import "./components/views/beacon/_StyledLiveBeaconIcon.pcss";
 @import "./components/views/context_menus/_KebabContextMenu.pcss";

res/css/components/views/beacon/_DialogSidebar.pcss

@@ -34,7 +34,6 @@ Please see LICENSE files in the repository root for full details.
 
         .mx_DialogSidebar_closeButtonIcon {
             color: $tertiary-content;
-            height: 12px;
         }
     }
 

res/css/components/views/beacon/_RoomLiveShareWarning.pcss

@@ -16,11 +16,13 @@ Please see LICENSE files in the repository root for full details.
 
     .mx_SearchBox_closeButton {
         cursor: pointer;
-        background-image: url("$(res)/img/icons-close.svg");
-        background-repeat: no-repeat;
+        mask-image: url("@vector-im/compound-design-tokens/icons/close.svg");
+        mask-repeat: no-repeat;
+        mask-position: center;
+        mask-size: 16px;
         width: 16px;
         height: 16px;
-        background-position: center;
         padding: 9px;
+        background-color: var(--cpd-color-icon-secondary);
     }
 }

res/css/structures/_SearchBox.pcss

@@ -55,5 +55,5 @@ Please see LICENSE files in the repository root for full details.
     mask-repeat: no-repeat;
     mask-position: center;
     background-color: $muted-fg-color;
-    mask-image: url("$(res)/img/icons-close.svg");
+    mask-image: url("@vector-im/compound-design-tokens/icons/close.svg");
 }

res/css/structures/_UploadBar.pcss

@@ -204,66 +204,3 @@ Please see LICENSE files in the repository root for full details.
         mask-image: url("@vector-im/compound-design-tokens/icons/qr-code.svg");
     }
 }
-
-.mx_UserMenu_CustomStatusSection {
-    margin: 0 12px 8px;
-
-    .mx_UserMenu_CustomStatusSection_field {
-        position: relative;
-        display: flex;
-
-        &.mx_UserMenu_CustomStatusSection_field_hasQuery {
-            .mx_UserMenu_CustomStatusSection_clear {
-                display: block;
-            }
-        }
-
-        > .mx_UserMenu_CustomStatusSection_input {
-            border: 1px solid $accent;
-            border-radius: 8px;
-            width: 100%;
-
-            &:focus + .mx_UserMenu_CustomStatusSection_clear {
-                display: block;
-            }
-        }
-
-        > .mx_UserMenu_CustomStatusSection_clear {
-            display: none;
-
-            position: absolute;
-            top: 50%;
-            right: 0;
-            transform: translateY(-50%);
-
-            width: 16px;
-            height: 16px;
-            margin-right: 8px;
-            background-color: $quinary-content;
-            border-radius: 50%;
-
-            &::before {
-                content: "";
-                position: absolute;
-                width: inherit;
-                height: inherit;
-                mask-image: url("$(res)/img/feather-customised/x.svg");
-                mask-position: center;
-                mask-size: 12px;
-                mask-repeat: no-repeat;
-                background-color: $secondary-content;
-            }
-        }
-    }
-
-    > p {
-        font-size: $font-12px;
-        line-height: $font-15px;
-        color: $secondary-content;
-        margin: 4px 0;
-    }
-
-    .mx_AccessibleButton_kind_primary_outline {
-        display: block;
-    }
-}

res/css/structures/_UserMenu.pcss

@@ -52,15 +52,13 @@ Please see LICENSE files in the repository root for full details.
 
             &::before {
                 content: "";
-                mask: url("$(res)/img/element-icons/x-8px.svg");
+                mask: url("@vector-im/compound-design-tokens/icons/close.svg");
                 mask-repeat: no-repeat;
                 mask-position: center;
-                mask-size: cover;
-                width: 8px;
-                height: 8px;
+                mask-size: 16px;
+                width: inherit;
+                height: inherit;
                 position: absolute;
-                top: 6px;
-                left: 6px;
                 background-color: $secondary-content;
             }
         }

res/css/views/dialogs/_PollCreateDialog.pcss

@@ -89,7 +89,7 @@ Please see LICENSE files in the repository root for full details.
                 color: $alert;
 
                 &::before {
-                    mask-image: url("$(res)/img/feather-customised/x.svg");
+                    mask-image: url("@vector-im/compound-design-tokens/icons/close.svg");
                     background-color: $alert;
                 }
             }

res/css/views/dialogs/security/_AccessSecretStorageDialog.pcss

@@ -72,7 +72,7 @@ Please see LICENSE files in the repository root for full details.
             background-color: var(--cpd-color-bg-critical-primary);
 
             &::before {
-                mask-image: url("$(res)/img/feather-customised/x.svg");
+                mask-image: url("@vector-im/compound-design-tokens/icons/close.svg");
             }
         }