diff --git a/playwright/e2e/spaces/threads-activity-centre/index.ts b/playwright/e2e/spaces/threads-activity-centre/index.ts index cf889f64cc..c4781c1c27 100644 --- a/playwright/e2e/spaces/threads-activity-centre/index.ts +++ b/playwright/e2e/spaces/threads-activity-centre/index.ts @@ -8,7 +8,7 @@ Please see LICENSE files in the repository root for full details. import { type JSHandle, type Locator, type Page } from "@playwright/test"; -import type { MatrixEvent, IContent, Room } from "matrix-js-sdk/src/matrix"; +import type { MatrixEvent, IContent, Room, Preset } from "matrix-js-sdk/src/matrix"; import { test as base, expect } from "../../../element-web-test"; import { type Bot } from "../../../pages/bot"; import { type Client } from "../../../pages/client"; @@ -37,7 +37,11 @@ export const test = base.extend<{ room1Name: "Room 1", room1: async ({ room1Name: name, app, user, bot }, use) => { - const roomId = await app.client.createRoom({ name, invite: [bot.credentials.userId] }); + const roomId = await app.client.createRoom({ + name, + invite: [bot.credentials.userId], + preset: "public_chat" as Preset, + }); await bot.awaitRoomMembership(roomId); await use({ name, roomId }); }, diff --git a/playwright/snapshots/spaces/threads-activity-centre/threadsActivityCentre.spec.ts/tac-panel-mix-unread-linux.png b/playwright/snapshots/spaces/threads-activity-centre/threadsActivityCentre.spec.ts/tac-panel-mix-unread-linux.png index 0785ecbe97..8aecb37019 100644 Binary files a/playwright/snapshots/spaces/threads-activity-centre/threadsActivityCentre.spec.ts/tac-panel-mix-unread-linux.png and b/playwright/snapshots/spaces/threads-activity-centre/threadsActivityCentre.spec.ts/tac-panel-mix-unread-linux.png differ diff --git a/playwright/snapshots/spaces/threads-activity-centre/threadsActivityCentre.spec.ts/tac-panel-notification-unread-linux.png b/playwright/snapshots/spaces/threads-activity-centre/threadsActivityCentre.spec.ts/tac-panel-notification-unread-linux.png index 8b6af97d6e..4a0ac14609 100644 Binary files a/playwright/snapshots/spaces/threads-activity-centre/threadsActivityCentre.spec.ts/tac-panel-notification-unread-linux.png and b/playwright/snapshots/spaces/threads-activity-centre/threadsActivityCentre.spec.ts/tac-panel-notification-unread-linux.png differ diff --git a/res/css/views/avatars/_DecoratedRoomAvatar.pcss b/res/css/views/avatars/_DecoratedRoomAvatar.pcss index c014e4bce7..f170471a01 100644 --- a/res/css/views/avatars/_DecoratedRoomAvatar.pcss +++ b/res/css/views/avatars/_DecoratedRoomAvatar.pcss @@ -27,36 +27,42 @@ Please see LICENSE files in the repository root for full details. width: 25%; /* 8px for a 32x32 avatar */ height: 25%; border-radius: 50%; - } - .mx_DecoratedRoomAvatar_icon::before { - content: ""; - width: 100%; - height: 100%; - right: 0; - position: absolute; - border-radius: 8px; + &::before, + svg { + width: 100%; + height: 100%; + right: 0; + position: absolute; + border-radius: 8px; + } } .mx_DecoratedRoomAvatar_icon_globe svg { - width: inherit; - height: inherit; + /* Oversize the icon to account for the dead space around the icon within the canvas */ + width: 120%; + height: 120%; + margin: -10%; color: $secondary-content; } .mx_DecoratedRoomAvatar_icon_offline::before { + content: ""; background-color: $presence-offline; } .mx_DecoratedRoomAvatar_icon_online::before { + content: ""; background-color: $accent; } .mx_DecoratedRoomAvatar_icon_away::before { + content: ""; background-color: $presence-away; } .mx_DecoratedRoomAvatar_icon_busy::before { + content: ""; background-color: $presence-busy; } diff --git a/src/components/views/avatars/DecoratedRoomAvatar.tsx b/src/components/views/avatars/DecoratedRoomAvatar.tsx index 5d3d504105..ac7206ae59 100644 --- a/src/components/views/avatars/DecoratedRoomAvatar.tsx +++ b/src/components/views/avatars/DecoratedRoomAvatar.tsx @@ -46,6 +46,7 @@ interface IProps { tooltipProps?: { tabIndex?: number; }; + className?: string; } interface IState { @@ -186,7 +187,8 @@ export default class DecoratedRoomAvatar extends React.PureComponent diff --git a/test/unit-tests/components/views/spaces/__snapshots__/ThreadsActivityCentre-test.tsx.snap b/test/unit-tests/components/views/spaces/__snapshots__/ThreadsActivityCentre-test.tsx.snap index 4c26f99dc0..ad30c36539 100644 --- a/test/unit-tests/components/views/spaces/__snapshots__/ThreadsActivityCentre-test.tsx.snap +++ b/test/unit-tests/components/views/spaces/__snapshots__/ThreadsActivityCentre-test.tsx.snap @@ -34,7 +34,7 @@ exports[`ThreadsActivityCentre renders notifications matching the snapshot 1`] = tabindex="-1" >