diff --git a/playwright/snapshots/composer/CIDER.spec.ts/emoji-picker-linux.png b/playwright/snapshots/composer/CIDER.spec.ts/emoji-picker-linux.png index 8c0daa555c..27d91ca70f 100644 Binary files a/playwright/snapshots/composer/CIDER.spec.ts/emoji-picker-linux.png and b/playwright/snapshots/composer/CIDER.spec.ts/emoji-picker-linux.png differ diff --git a/playwright/snapshots/composer/CIDER.spec.ts/emoji-picker-small-linux.png b/playwright/snapshots/composer/CIDER.spec.ts/emoji-picker-small-linux.png index e3911831de..d9238f36fb 100644 Binary files a/playwright/snapshots/composer/CIDER.spec.ts/emoji-picker-small-linux.png and b/playwright/snapshots/composer/CIDER.spec.ts/emoji-picker-small-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 b44e61b3eb..a991d72bba 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 c182c853b9..450cb384d6 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/room-directory/room-directory.spec.ts/filtered-no-results-linux.png b/playwright/snapshots/room-directory/room-directory.spec.ts/filtered-no-results-linux.png index e02a1a24cf..102d66419a 100644 Binary files a/playwright/snapshots/room-directory/room-directory.spec.ts/filtered-no-results-linux.png and b/playwright/snapshots/room-directory/room-directory.spec.ts/filtered-no-results-linux.png differ diff --git a/playwright/snapshots/room-directory/room-directory.spec.ts/filtered-one-result-linux.png b/playwright/snapshots/room-directory/room-directory.spec.ts/filtered-one-result-linux.png index 213cdb1d87..41d21f856a 100644 Binary files a/playwright/snapshots/room-directory/room-directory.spec.ts/filtered-one-result-linux.png and b/playwright/snapshots/room-directory/room-directory.spec.ts/filtered-one-result-linux.png differ diff --git a/res/css/structures/_HomePage.pcss b/res/css/structures/_HomePage.pcss index 505fc4bad6..62d0d6c18b 100644 --- a/res/css/structures/_HomePage.pcss +++ b/res/css/structures/_HomePage.pcss @@ -84,7 +84,7 @@ Please see LICENSE files in the repository root for full details. } &.mx_HomePage_button_sendDm::before { - mask-image: url("$(res)/img/element-icons/feedback.svg"); + mask-image: url("@vector-im/compound-design-tokens/icons/chat-solid.svg"); } &.mx_HomePage_button_explore::before { diff --git a/res/css/views/dialogs/_SpotlightDialog.pcss b/res/css/views/dialogs/_SpotlightDialog.pcss index 67d2ebcc39..c75b07e884 100644 --- a/res/css/views/dialogs/_SpotlightDialog.pcss +++ b/res/css/views/dialogs/_SpotlightDialog.pcss @@ -94,7 +94,7 @@ Please see LICENSE files in the repository root for full details. } &.mx_SpotlightDialog_filterPeople::before { - mask-image: url("@vector-im/compound-design-tokens/icons/user-profile-solid.svg"); + mask-image: url("@vector-im/compound-design-tokens/icons/user-profile.svg"); } &.mx_SpotlightDialog_filterPublicRooms::before { @@ -102,7 +102,7 @@ Please see LICENSE files in the repository root for full details. } &.mx_SpotlightDialog_filterPublicSpaces::before { - mask-image: url("$(res)/img/element-icons/spaces.svg"); + mask-image: url("@vector-im/compound-design-tokens/icons/space.svg"); } .mx_SpotlightDialog_filter--close { @@ -435,7 +435,7 @@ Please see LICENSE files in the repository root for full details. } .mx_SpotlightDialog_startChat::before { - mask-image: url("@vector-im/compound-design-tokens/icons/user-profile-solid.svg"); + mask-image: url("@vector-im/compound-design-tokens/icons/user-profile.svg"); } .mx_SpotlightDialog_joinRoomAlias::before { @@ -447,7 +447,7 @@ Please see LICENSE files in the repository root for full details. } .mx_SpotlightDialog_explorePublicSpaces::before { - mask-image: url("$(res)/img/element-icons/spaces.svg"); + mask-image: url("@vector-im/compound-design-tokens/icons/space.svg"); } .mx_SpotlightDialog_startGroupChat::before { @@ -503,15 +503,15 @@ Please see LICENSE files in the repository root for full details. mask-size: contain; &.mx_SpotlightDialog_metaspaceResult_home-space { - mask-image: url("@vector-im/compound-design-tokens/icons/home-solid.svg"); + mask-image: url("@vector-im/compound-design-tokens/icons/home.svg"); } &.mx_SpotlightDialog_metaspaceResult_favourites-space { - mask-image: url("@vector-im/compound-design-tokens/icons/favourite-solid.svg"); + mask-image: url("@vector-im/compound-design-tokens/icons/favourite.svg"); } &.mx_SpotlightDialog_metaspaceResult_people-space { - mask-image: url("@vector-im/compound-design-tokens/icons/user-profile-solid.svg"); + mask-image: url("@vector-im/compound-design-tokens/icons/user-profile.svg"); } &.mx_SpotlightDialog_metaspaceResult_orphans-space { diff --git a/res/css/views/elements/_DialPadBackspaceButton.pcss b/res/css/views/elements/_DialPadBackspaceButton.pcss index 4e305999ff..0dae4b67e2 100644 --- a/res/css/views/elements/_DialPadBackspaceButton.pcss +++ b/res/css/views/elements/_DialPadBackspaceButton.pcss @@ -24,7 +24,7 @@ Please see LICENSE files in the repository root for full details. display: inline-block; vertical-align: middle; - mask-image: url("$(res)/img/element-icons/call/delete.svg"); + mask-image: url("@vector-im/compound-design-tokens/icons/backspace-solid.svg"); mask-position: 8px; mask-size: 20px; mask-repeat: no-repeat; diff --git a/res/css/views/emojipicker/_EmojiPicker.pcss b/res/css/views/emojipicker/_EmojiPicker.pcss index bc14c2e958..babdb1d5e7 100644 --- a/res/css/views/emojipicker/_EmojiPicker.pcss +++ b/res/css/views/emojipicker/_EmojiPicker.pcss @@ -66,9 +66,6 @@ Please see LICENSE files in the repository root for full details. .mx_EmojiPicker_anchor_activity::before { mask-image: url("$(res)/img/emojipicker/activity.svg"); } -.mx_EmojiPicker_anchor_custom::before { - mask-image: url("$(res)/img/emojipicker/custom.svg"); -} .mx_EmojiPicker_anchor_flags::before { mask-image: url("$(res)/img/emojipicker/flags.svg"); } @@ -132,7 +129,7 @@ Please see LICENSE files in the repository root for full details. } .mx_EmojiPicker_search_icon { - width: 16px; + width: 20px; margin: 8px; } @@ -141,7 +138,7 @@ Please see LICENSE files in the repository root for full details. } .mx_EmojiPicker_search_icon::after { - mask: url("$(res)/img/emojipicker/search.svg") no-repeat; + mask: url("@vector-im/compound-design-tokens/icons/search.svg") no-repeat; mask-size: 100%; background-color: $primary-content; content: ""; @@ -151,7 +148,7 @@ Please see LICENSE files in the repository root for full details. } .mx_EmojiPicker_search_clear::after { - mask-image: url("$(res)/img/emojipicker/delete.svg"); + mask-image: url("@vector-im/compound-design-tokens/icons/close.svg"); } .mx_EmojiPicker_category { diff --git a/res/img/element-icons/call/delete.svg b/res/img/element-icons/call/delete.svg deleted file mode 100644 index 133bdad4ca..0000000000 --- a/res/img/element-icons/call/delete.svg +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - diff --git a/res/img/element-icons/feedback.svg b/res/img/element-icons/feedback.svg deleted file mode 100644 index 3ee20d18d9..0000000000 --- a/res/img/element-icons/feedback.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/res/img/element-icons/roomlist/hash-video.svg b/res/img/element-icons/roomlist/hash-video.svg deleted file mode 100644 index b0e1decf68..0000000000 --- a/res/img/element-icons/roomlist/hash-video.svg +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/res/img/element-icons/spaces.svg b/res/img/element-icons/spaces.svg deleted file mode 100644 index 7183b4eca9..0000000000 --- a/res/img/element-icons/spaces.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/res/img/emojipicker/custom.svg b/res/img/emojipicker/custom.svg deleted file mode 100644 index 814cd8ec13..0000000000 --- a/res/img/emojipicker/custom.svg +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - diff --git a/res/img/emojipicker/delete.svg b/res/img/emojipicker/delete.svg deleted file mode 100644 index 5f5d4e52eb..0000000000 --- a/res/img/emojipicker/delete.svg +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/res/img/emojipicker/search.svg b/res/img/emojipicker/search.svg deleted file mode 100644 index b5f660b3ac..0000000000 --- a/res/img/emojipicker/search.svg +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/src/components/structures/SpaceRoomView.tsx b/src/components/structures/SpaceRoomView.tsx index 1df95439d4..27c9fb66b0 100644 --- a/src/components/structures/SpaceRoomView.tsx +++ b/src/components/structures/SpaceRoomView.tsx @@ -15,6 +15,7 @@ import { PlusIcon, RoomIcon, UserProfileSolidIcon, + VideoCallSolidIcon, } from "@vector-im/compound-design-tokens/assets/web/icons"; import MatrixClientContext from "../../contexts/MatrixClientContext"; @@ -72,7 +73,6 @@ import MainSplit from "./MainSplit"; import RightPanel from "./RightPanel"; import SpaceHierarchy, { showRoom } from "./SpaceHierarchy"; import { type RoomPermalinkCreator } from "../../utils/permalinks/Permalinks"; -import { Icon as HashVideoIcon } from "../../../res/img/element-icons/roomlist/hash-video.svg"; import SpacePillButton from "./SpacePillButton.tsx"; interface IProps { @@ -140,7 +140,7 @@ const SpaceLandingAddButton: React.FC<{ space: Room }> = ({ space }) => { {videoRoomsEnabled && ( } + icon={} onClick={async (e): Promise => { e.preventDefault(); e.stopPropagation(); diff --git a/src/components/views/rooms/LegacyRoomList.tsx b/src/components/views/rooms/LegacyRoomList.tsx index 95b62cf4c9..50519cbfe8 100644 --- a/src/components/views/rooms/LegacyRoomList.tsx +++ b/src/components/views/rooms/LegacyRoomList.tsx @@ -14,6 +14,7 @@ import { RoomIcon, SearchIcon, ShareIcon, + VideoCallSolidIcon, } from "@vector-im/compound-design-tokens/assets/web/icons"; import { type IState as IRovingTabIndexState, RovingTabIndexProvider } from "../../../accessibility/RovingTabIndex.tsx"; @@ -74,7 +75,6 @@ import { getKeyBindingsManager } from "../../../KeyBindingsManager.ts"; import AccessibleButton from "../elements/AccessibleButton.tsx"; import { Landmark, LandmarkNavigation } from "../../../accessibility/LandmarkNavigation.ts"; import LegacyCallHandler, { LegacyCallHandlerEvent } from "../../../LegacyCallHandler.tsx"; -import { Icon as HashVideoIcon } from "../../../../res/img/element-icons/roomlist/hash-video.svg"; interface IProps { onKeyDown: (ev: React.KeyboardEvent, state: IRovingTabIndexState) => void; @@ -269,7 +269,7 @@ const UntaggedAuxButton: React.FC = ({ tabIndex }) => { {videoRoomsEnabled && ( } + icon={} onClick={(e) => { e.preventDefault(); e.stopPropagation(); @@ -320,7 +320,7 @@ const UntaggedAuxButton: React.FC = ({ tabIndex }) => { {videoRoomsEnabled && ( } + icon={} onClick={(e) => { e.preventDefault(); e.stopPropagation(); diff --git a/src/components/views/rooms/LegacyRoomListHeader.tsx b/src/components/views/rooms/LegacyRoomListHeader.tsx index a3c96ff60f..57093144b1 100644 --- a/src/components/views/rooms/LegacyRoomListHeader.tsx +++ b/src/components/views/rooms/LegacyRoomListHeader.tsx @@ -14,6 +14,7 @@ import { UserAddSolidIcon, SearchIcon, UserAddIcon, + VideoCallSolidIcon, } from "@vector-im/compound-design-tokens/assets/web/icons"; import MatrixClientContext from "../../../contexts/MatrixClientContext"; @@ -57,7 +58,6 @@ import IconizedContextMenu, { import SpaceContextMenu from "../context_menus/SpaceContextMenu"; import InlineSpinner from "../elements/InlineSpinner"; import { HomeButtonContextMenu } from "../spaces/SpacePanel"; -import { Icon as HashVideoIcon } from "../../../../res/img/element-icons/roomlist/hash-video.svg"; const contextMenuBelow = (elementRect: DOMRect): MenuProps => { // align the context menu's icons with the icon which opened the context menu @@ -213,7 +213,7 @@ const LegacyRoomListHeader: React.FC = ({ onVisibilityChange }) => { /> {videoRoomsEnabled && ( } + icon={} label={_t("action|new_video_room")} onClick={(e) => { e.preventDefault(); @@ -319,7 +319,7 @@ const LegacyRoomListHeader: React.FC = ({ onVisibilityChange }) => { {videoRoomsEnabled && ( } + icon={} onClick={(e) => { e.preventDefault(); e.stopPropagation();