diff --git a/res/css/structures/_RightPanel.pcss b/res/css/structures/_RightPanel.pcss index f96f8b7232..8c1ed8691f 100644 --- a/res/css/structures/_RightPanel.pcss +++ b/res/css/structures/_RightPanel.pcss @@ -24,36 +24,6 @@ Please see LICENSE files in the repository root for full details. } } -/** Fixme - factor this out with the main header **/ - -.mx_RightPanel_threadsButton::before { - mask-image: url("@vector-im/compound-design-tokens/icons/threads-solid.svg"); -} - -.mx_RightPanel_notifsButton::before { - mask-image: url("$(res)/img/element-icons/notifications.svg"); - mask-position: center; -} - -.mx_RightPanel_roomSummaryButton::before { - mask-image: url("@vector-im/compound-design-tokens/icons/info-solid.svg"); - mask-position: center; -} - -.mx_RightPanel_pinnedMessagesButton { - &::before { - mask-image: url("$(res)/img/element-icons/room/pin.svg"); - mask-position: center; - } -} - -.mx_RightPanel_timelineCardButton { - &::before { - mask-image: url("$(res)/img/element-icons/feedback.svg"); - mask-position: center; - } -} - .mx_RightPanel .mx_MemberList, .mx_RightPanel .mx_MemberInfo { order: 2; diff --git a/res/css/structures/_ToastContainer.pcss b/res/css/structures/_ToastContainer.pcss index cf1d7fd4a9..4129ec7749 100644 --- a/res/css/structures/_ToastContainer.pcss +++ b/res/css/structures/_ToastContainer.pcss @@ -74,21 +74,11 @@ Please see LICENSE files in the repository root for full details. } } - &.mx_Toast_icon_secure_backup::after { - mask-image: url("$(res)/img/feather-customised/secure-backup.svg"); - background-color: $primary-content; - } - &.mx_Toast_icon_key_storage::after { mask-image: url("@vector-im/compound-design-tokens/icons/settings-solid.svg"); background-color: $primary-content; } - &.mx_Toast_icon_labs::after { - mask-image: url("$(res)/img/element-icons/flask.svg"); - background-color: $secondary-content; - } - .mx_Toast_title, .mx_Toast_body { grid-column: 2; diff --git a/res/css/views/context_menus/_RoomGeneralContextMenu.pcss b/res/css/views/context_menus/_RoomGeneralContextMenu.pcss index 0eb51420bb..cb6a56117b 100644 --- a/res/css/views/context_menus/_RoomGeneralContextMenu.pcss +++ b/res/css/views/context_menus/_RoomGeneralContextMenu.pcss @@ -14,50 +14,10 @@ mask-image: url("$(res)/img/element-icons/roomlist/mark-as-unread.svg"); } -.mx_RoomGeneralContextMenu_iconNotificationsDefault::before { - mask-image: url("$(res)/img/element-icons/notifications.svg"); -} - -.mx_RoomGeneralContextMenu_iconNotificationsAllMessages::before { - mask-image: url("$(res)/img/element-icons/roomlist/notifications-default.svg"); -} - -.mx_RoomGeneralContextMenu_iconNotificationsMentionsKeywords::before { - mask-image: url("$(res)/img/element-icons/roomlist/notifications-dm.svg"); -} - -.mx_RoomGeneralContextMenu_iconNotificationsNone::before { - mask-image: url("$(res)/img/element-icons/roomlist/notifications-off.svg"); -} - -.mx_RoomGeneralContextMenu_iconPeople::before { - mask-image: url("@vector-im/compound-design-tokens/icons/user-profile-solid.svg"); -} - -.mx_RoomGeneralContextMenu_iconFiles::before { - mask-image: url("@vector-im/compound-design-tokens/icons/files.svg"); -} - -.mx_RoomGeneralContextMenu_iconPins::before { - mask-image: url("$(res)/img/element-icons/room/pin-upright.svg"); -} - -.mx_RoomGeneralContextMenu_iconWidgets::before { - mask-image: url("@vector-im/compound-design-tokens/icons/extensions-solid.svg"); -} - .mx_RoomGeneralContextMenu_iconSettings::before { mask-image: url("@vector-im/compound-design-tokens/icons/settings-solid.svg"); } -.mx_RoomGeneralContextMenu_iconExport::before { - mask-image: url("@vector-im/compound-design-tokens/icons/export-archive.svg"); -} - -.mx_RoomGeneralContextMenu_iconDeveloperTools::before { - mask-image: url("$(res)/img/element-icons/settings/flask.svg"); -} - .mx_RoomGeneralContextMenu_iconCopyLink::before { mask-image: url("@vector-im/compound-design-tokens/icons/link.svg"); } diff --git a/res/css/views/right_panel/_UserInfo.pcss b/res/css/views/right_panel/_UserInfo.pcss index 2b6480bd84..70cc4ba064 100644 --- a/res/css/views/right_panel/_UserInfo.pcss +++ b/res/css/views/right_panel/_UserInfo.pcss @@ -13,26 +13,6 @@ Please see LICENSE files in the repository root for full details. overflow-y: auto; font-size: var(--cpd-font-size-body-sm); - .mx_UserInfo_cancel { - cursor: pointer; - position: absolute; - top: 0; - border-radius: 4px; - background-color: $dark-panel-bg-color; - margin: 9px; - z-index: 1; /* render on top of the right panel */ - - div { - height: 16px; - width: 16px; - padding: 4px; - mask-image: url("@vector-im/compound-design-tokens/icons/chevron-left.svg"); - mask-repeat: no-repeat; - mask-position: center; - background-color: $header-panel-text-primary-color; - } - } - .mx_UserInfo_container { padding: var(--cpd-space-2x) 0 var(--cpd-space-4x); margin: 0 var(--cpd-space-4x); diff --git a/res/css/views/rooms/_LegacyRoomList.pcss b/res/css/views/rooms/_LegacyRoomList.pcss index acf162b7a2..c2cdcc220b 100644 --- a/res/css/views/rooms/_LegacyRoomList.pcss +++ b/res/css/views/rooms/_LegacyRoomList.pcss @@ -25,9 +25,6 @@ Please see LICENSE files in the repository root for full details. .mx_LegacyRoomList_iconExplore::before { mask-image: url("$(res)/img/element-icons/roomlist/hash-search.svg"); } -.mx_LegacyRoomList_iconDialpad::before { - mask-image: url("$(res)/img/element-icons/roomlist/dialpad.svg"); -} .mx_LegacyRoomList_iconStartChat::before { mask-image: url("@vector-im/compound-design-tokens/icons/user-add-solid.svg"); } diff --git a/res/css/views/rooms/_RoomTile.pcss b/res/css/views/rooms/_RoomTile.pcss index 798f3bfa46..23649228e6 100644 --- a/res/css/views/rooms/_RoomTile.pcss +++ b/res/css/views/rooms/_RoomTile.pcss @@ -165,79 +165,3 @@ Please see LICENSE files in the repository root for full details. } } } - -/* We use these both in context menus and the room tiles */ -.mx_RoomTile_iconBell::before { - mask-image: url("$(res)/img/element-icons/notifications.svg"); -} -.mx_RoomTile_iconBellDot::before { - mask-image: url("$(res)/img/element-icons/roomlist/notifications-default.svg"); -} -.mx_RoomTile_iconBellCrossed::before { - mask-image: url("$(res)/img/element-icons/roomlist/notifications-off.svg"); -} -.mx_RoomTile_iconBellMentions::before { - mask-image: url("$(res)/img/element-icons/roomlist/notifications-dm.svg"); -} - -.mx_RoomTile_contextMenu { - .mx_RoomTile_iconStar::before { - mask-image: url("@vector-im/compound-design-tokens/icons/favourite-solid.svg"); - } - - .mx_RoomTile_iconArrowDown::before { - mask-image: url("$(res)/img/element-icons/roomlist/low-priority.svg"); - } - - .mx_RoomTile_iconNotificationsDefault::before { - mask-image: url("$(res)/img/element-icons/notifications.svg"); - } - - .mx_RoomTile_iconNotificationsAllMessages::before { - mask-image: url("$(res)/img/element-icons/roomlist/notifications-default.svg"); - } - - .mx_RoomTile_iconNotificationsMentionsKeywords::before { - mask-image: url("$(res)/img/element-icons/roomlist/notifications-dm.svg"); - } - - .mx_RoomTile_iconNotificationsNone::before { - mask-image: url("$(res)/img/element-icons/roomlist/notifications-off.svg"); - } - - .mx_RoomTile_iconPeople::before { - mask-image: url("@vector-im/compound-design-tokens/icons/user-profile-solid.svg"); - } - - .mx_RoomTile_iconFiles::before { - mask-image: url("@vector-im/compound-design-tokens/icons/files.svg"); - } - - .mx_RoomTile_iconPins::before { - mask-image: url("$(res)/img/element-icons/room/pin-upright.svg"); - } - - .mx_RoomTile_iconWidgets::before { - mask-image: url("@vector-im/compound-design-tokens/icons/extensions-solid.svg"); - } - - .mx_RoomTile_iconSettings::before { - mask-image: url("@vector-im/compound-design-tokens/icons/settings-solid.svg"); - } - - .mx_RoomTile_iconExport::before { - mask-image: url("@vector-im/compound-design-tokens/icons/export-archive.svg"); - } - - .mx_RoomTile_iconCopyLink::before { - mask-image: url("@vector-im/compound-design-tokens/icons/link.svg"); - } - - .mx_RoomTile_iconInvite::before { - mask-image: url("$(res)/img/element-icons/room/invite.svg"); - } - - .mx_RoomTile_iconSignOut::before { - mask-image: url("@vector-im/compound-design-tokens/icons/leave.svg"); - } -} diff --git a/res/img/element-icons/flask.svg b/res/img/element-icons/flask.svg deleted file mode 100644 index 1b6d1204ea..0000000000 --- a/res/img/element-icons/flask.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/res/img/element-icons/room/pin.svg b/res/img/element-icons/room/pin.svg deleted file mode 100644 index f090f60be8..0000000000 --- a/res/img/element-icons/room/pin.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/res/img/element-icons/roomlist/dialpad.svg b/res/img/element-icons/roomlist/dialpad.svg deleted file mode 100644 index b51d4a4dc9..0000000000 --- a/res/img/element-icons/roomlist/dialpad.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/src/stores/ToastStore.ts b/src/stores/ToastStore.ts index 7cb9d60925..dd09c610b8 100644 --- a/src/stores/ToastStore.ts +++ b/src/stores/ToastStore.ts @@ -17,7 +17,7 @@ export interface IToast { // higher priority number will be shown on top of lower priority priority: number; title?: string; - icon?: string; + icon?: "verification" | "verification_warning" | "key_storage"; component: C; className?: string; bodyClassName?: string; diff --git a/src/toasts/SetupEncryptionToast.ts b/src/toasts/SetupEncryptionToast.ts index 21e0ea4fa4..965d8e17fc 100644 --- a/src/toasts/SetupEncryptionToast.ts +++ b/src/toasts/SetupEncryptionToast.ts @@ -17,7 +17,7 @@ import { _t } from "../languageHandler"; import DeviceListener from "../DeviceListener"; import SetupEncryptionDialog from "../components/views/dialogs/security/SetupEncryptionDialog"; import { AccessCancelledError, accessSecretStorage } from "../SecurityManager"; -import ToastStore from "../stores/ToastStore"; +import ToastStore, { type IToast } from "../stores/ToastStore"; import GenericToast from "../components/views/toasts/GenericToast"; import { ModuleRunner } from "../modules/ModuleRunner"; import { SetupEncryptionStore } from "../stores/SetupEncryptionStore"; @@ -46,7 +46,7 @@ const getTitle = (kind: Kind): string => { } }; -const getIcon = (kind: Kind): string | undefined => { +const getIcon = (kind: Kind): IToast["icon"] => { switch (kind) { case Kind.SET_UP_RECOVERY: return undefined;