From 773b93e96d9d0134e723eca7ae51411f128f8ffc Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Mon, 22 Jul 2024 09:56:53 +0100 Subject: [PATCH] De-duplicate icons using Compound Design Tokens Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- res/css/_common.pcss | 4 +- .../components/views/polls/_PollOption.pcss | 2 +- res/css/structures/_GenericDropdownMenu.pcss | 4 +- res/css/structures/_RightPanel.pcss | 4 +- res/css/structures/_RoomSearch.pcss | 2 +- res/css/structures/_RoomStatusBar.pcss | 4 +- res/css/structures/_RoomView.pcss | 2 +- res/css/structures/_SearchBox.pcss | 2 +- res/css/structures/_SpaceHierarchy.pcss | 4 +- res/css/structures/_SpacePanel.pcss | 24 ++--- res/css/structures/_SpaceRoomView.pcss | 4 +- res/css/structures/_UploadBar.pcss | 2 +- res/css/structures/_UserMenu.pcss | 10 +- .../audio_messages/_PlayPauseButton.pcss | 4 +- .../context_menus/_IconizedContextMenu.pcss | 2 +- .../context_menus/_MessageContextMenu.pcss | 20 ++-- .../_RoomGeneralContextMenu.pcss | 14 +-- .../dialogs/_AddExistingToSpaceDialog.pcss | 4 +- .../dialogs/_AnalyticsLearnMoreDialog.pcss | 2 +- .../_ConfirmSpaceUserActionDialog.pcss | 2 +- res/css/views/dialogs/_InviteDialog.pcss | 2 +- res/css/views/dialogs/_JoinRuleDropdown.pcss | 2 +- res/css/views/dialogs/_LeaveSpaceDialog.pcss | 2 +- .../_ManageRestrictedJoinRuleDialog.pcss | 2 +- res/css/views/dialogs/_PollCreateDialog.pcss | 2 +- .../views/dialogs/_RoomSettingsDialog.pcss | 6 +- .../views/dialogs/_SpaceSettingsDialog.pcss | 2 +- res/css/views/dialogs/_SpotlightDialog.pcss | 16 ++-- .../views/dialogs/_UserSettingsDialog.pcss | 6 +- .../security/_AccessSecretStorageDialog.pcss | 4 +- res/css/views/directory/_NetworkDropdown.pcss | 2 +- res/css/views/elements/_AccessibleButton.pcss | 4 +- res/css/views/elements/_Dropdown.pcss | 2 +- res/css/views/elements/_FacePile.pcss | 2 +- res/css/views/elements/_Field.pcss | 2 +- res/css/views/elements/_ImageView.pcss | 4 +- res/css/views/elements/_InfoTooltip.pcss | 2 +- res/css/views/elements/_StyledCheckbox.pcss | 2 +- .../elements/_UseCaseSelectionButton.pcss | 2 +- res/css/views/elements/_Validation.pcss | 4 +- res/css/views/messages/_DateSeparator.pcss | 2 +- res/css/views/messages/_LegacyCallEvent.pcss | 4 +- res/css/views/messages/_RedactedBody.pcss | 2 +- res/css/views/messages/_ViewSourceEvent.pcss | 4 +- res/css/views/right_panel/_BaseCard.pcss | 2 +- .../views/right_panel/_RoomSummaryCard.pcss | 4 +- res/css/views/right_panel/_ThreadPanel.pcss | 6 +- res/css/views/rooms/_EventTile.pcss | 4 +- res/css/views/rooms/_JumpToBottomButton.pcss | 2 +- res/css/views/rooms/_LegacyRoomHeader.pcss | 8 +- res/css/views/rooms/_MessageComposer.pcss | 10 +- .../rooms/_MessageComposerFormatBar.pcss | 12 +-- res/css/views/rooms/_PinnedEventTile.pcss | 2 +- res/css/views/rooms/_ReplyPreview.pcss | 2 +- res/css/views/rooms/_RoomInfoLine.pcss | 2 +- res/css/views/rooms/_RoomList.pcss | 2 +- res/css/views/rooms/_RoomListHeader.pcss | 6 +- res/css/views/rooms/_RoomPreviewCard.pcss | 2 +- res/css/views/rooms/_RoomSublist.pcss | 6 +- res/css/views/rooms/_RoomTile.pcss | 16 ++-- .../views/rooms/_TopUnreadMessagesBar.pcss | 4 +- .../views/rooms/_VoiceRecordComposerTile.pcss | 2 +- .../tabs/user/_SecurityUserSettingsTab.pcss | 2 +- res/css/views/spaces/_SpaceCreateMenu.pcss | 4 +- res/css/views/spaces/_SpacePublicShare.pcss | 2 +- res/css/views/toasts/_IncomingCallToast.pcss | 2 +- .../_UserOnboardingButton.pcss | 2 +- .../user-onboarding/_UserOnboardingTask.pcss | 2 +- .../_LegacyCallViewButtons.pcss | 16 ++-- res/css/views/voip/_CallView.pcss | 10 +- res/css/views/voip/_VideoFeed.pcss | 4 +- res/img/cancel-small.svg | 13 --- res/img/cancel.svg | 3 - res/img/compound/checkbox-32px.svg | 3 - res/img/compound/close-16px.svg | 3 - res/img/compound/close-8px.svg | 3 - res/img/compound/error-16px.svg | 3 - res/img/compound/mic-16px.svg | 4 - res/img/compound/pause-12.svg | 4 - res/img/compound/play-16.svg | 3 - res/img/compound/thread-16px.svg | 3 - res/img/compound/user.svg | 7 -- res/img/e2e/disabled.svg | 5 - res/img/element-icons/Email-icon.svg | 3 - res/img/element-icons/Mic-off.svg | 5 - res/img/element-icons/Record.svg | 3 - res/img/element-icons/Stop.svg | 3 - res/img/element-icons/back.svg | 3 - res/img/element-icons/brands/element.svg | 6 -- res/img/element-icons/cancel-rounded.svg | 4 - res/img/element-icons/caret-left.svg | 3 - res/img/element-icons/check-white.svg | 3 - res/img/element-icons/check.svg | 20 ---- res/img/element-icons/context-menu.svg | 5 - res/img/element-icons/copy.svg | 3 - res/img/element-icons/devices.svg | 11 --- res/img/element-icons/export.svg | 8 -- res/img/element-icons/home.svg | 3 - res/img/element-icons/info.svg | 4 - res/img/element-icons/leave.svg | 7 -- res/img/element-icons/link.svg | 3 - res/img/element-icons/location.svg | 3 - res/img/element-icons/lock.svg | 1 - res/img/element-icons/maximise-expand.svg | 3 - res/img/element-icons/message/chevron-up.svg | 1 - res/img/element-icons/message/fwd.svg | 3 - .../element-icons/message/overflow-large.svg | 5 - res/img/element-icons/message/thread.svg | 1 - res/img/element-icons/mic.svg | 1 - res/img/element-icons/minimise-collapse.svg | 3 - res/img/element-icons/pause.svg | 4 - res/img/element-icons/play.svg | 3 - res/img/element-icons/plus.svg | 3 - res/img/element-icons/qrcode.svg | 4 - res/img/element-icons/retry.svg | 7 -- res/img/element-icons/room/apps.svg | 6 -- res/img/element-icons/room/composer/bold.svg | 3 - .../room/composer/bulleted_list.svg | 10 -- .../room/composer/code_block.svg | 3 - .../room/composer/indent_decrease.svg | 10 -- .../room/composer/indent_increase.svg | 10 -- .../room/composer/inline_code.svg | 5 - .../element-icons/room/composer/italic.svg | 3 - res/img/element-icons/room/composer/link.svg | 3 - .../element-icons/room/composer/location.svg | 3 - .../room/composer/numbered_list.svg | 10 -- res/img/element-icons/room/composer/quote.svg | 6 -- .../element-icons/room/composer/rich_text.svg | 10 -- .../room/composer/strikethrough.svg | 4 - .../element-icons/room/composer/underline.svg | 3 - res/img/element-icons/room/ellipsis.svg | 5 - .../element-icons/room/format-bar/bold.svg | 5 - .../element-icons/room/format-bar/code.svg | 5 - .../element-icons/room/format-bar/italic.svg | 5 - .../element-icons/room/format-bar/quote.svg | 6 -- .../room/format-bar/strikethrough.svg | 4 - res/img/element-icons/room/members.svg | 7 -- .../element-icons/room/message-bar/reply.svg | 4 - res/img/element-icons/room/room-summary.svg | 3 - res/img/element-icons/room/thread.svg | 1 - res/img/element-icons/roomlist/checkmark.svg | 3 - res/img/element-icons/roomlist/favorite.svg | 3 - .../element-icons/roomlist/member-plus.svg | 3 - res/img/element-icons/roomlist/search.svg | 3 - res/img/element-icons/security.svg | 3 - res/img/element-icons/send-message.svg | 3 - res/img/element-icons/settings.svg | 3 - res/img/element-icons/thread-summary.svg | 1 - res/img/element-icons/trashcan.svg | 3 - res/img/element-icons/x-8px.svg | 4 - res/img/ellipsis.svg | 25 ----- res/img/feather-customised/alert-triangle.svg | 5 - res/img/feather-customised/check.svg | 3 - res/img/feather-customised/chevron-down.svg | 3 - res/img/feather-customised/dropdown-arrow.svg | 6 -- res/img/feather-customised/files.svg | 11 --- res/img/feather-customised/help-circle.svg | 6 -- res/img/feather-customised/image.svg | 5 - res/img/feather-customised/plus.svg | 4 - res/img/feather-customised/search-input.svg | 11 --- res/img/feather-customised/trash.custom.svg | 7 -- .../feather-customised/warning-triangle.svg | 13 --- res/img/feather-customised/x.svg | 4 - res/img/format/bold.svg | 3 - res/img/format/code.svg | 7 -- res/img/format/italics.svg | 3 - res/img/format/quote.svg | 5 - res/img/format/strikethrough.svg | 6 -- res/img/icon-address-delete.svg | 15 --- res/img/icon-email-user.svg | 17 ---- res/img/icon-invite-people.svg | 5 - res/img/icon-return.svg | 18 ---- res/img/icon_context_delete.svg | 11 --- res/img/icons-close.svg | 96 ------------------- res/img/icons-create-room.svg | 4 - res/img/icons-room-add.svg | 9 -- res/img/image-view/close.svg | 3 - res/img/image-view/more.svg | 3 - res/img/plus.svg | 13 --- res/img/tick-circle.svg | 4 - res/img/voip/call-view/cam-off.svg | 3 - res/img/voip/call-view/cam-on.svg | 3 - res/img/voip/call-view/more.svg | 3 - res/img/voip/call-view/screensharing.svg | 3 - res/img/voip/declined-video.svg | 3 - res/img/voip/missed-video.svg | 3 - .../legacy-light/css/_legacy-light.pcss | 2 +- res/themes/light/css/_light.pcss | 2 +- .../security/CreateSecretStorageDialog.tsx | 2 +- .../structures/AutocompleteInput.tsx | 2 +- src/components/structures/ErrorMessage.tsx | 3 +- src/components/structures/RoomStatusBar.tsx | 2 +- .../structures/auth/ForgotPassword.tsx | 2 +- .../auth/forgot-password/EnterEmail.tsx | 2 +- src/components/views/beacon/DialogSidebar.tsx | 2 +- .../views/beacon/RoomLiveShareWarning.tsx | 2 +- .../views/context_menus/KebabContextMenu.tsx | 2 +- .../views/dialogs/ForwardDialog.tsx | 6 +- .../views/dialogs/UploadConfirmDialog.tsx | 2 +- .../views/elements/AppPermission.tsx | 2 +- src/components/views/elements/AppTile.tsx | 6 +- .../views/elements/FilterDropdown.tsx | 2 +- src/components/views/elements/Pill.tsx | 2 +- src/components/views/elements/Tag.tsx | 2 +- src/components/views/location/MapFallback.tsx | 2 +- src/components/views/location/Marker.tsx | 2 +- .../views/location/ShareDialogButtons.tsx | 4 +- src/components/views/location/ShareType.tsx | 2 +- src/components/views/location/ZoomButtons.tsx | 2 +- .../views/messages/MessageActionBar.tsx | 10 +- src/components/views/pips/WidgetPip.tsx | 2 +- .../polls/pollHistory/PollDetailHeader.tsx | 2 +- .../views/right_panel/PinnedMessagesCard.tsx | 4 +- src/components/views/rooms/EntityTile.tsx | 2 +- .../EventTile/EventTileThreadToolbar.tsx | 2 +- .../views/rooms/LinkPreviewGroup.tsx | 2 +- src/components/views/rooms/MemberList.tsx | 6 +- src/components/views/rooms/RoomKnocksBar.tsx | 4 +- .../views/rooms/RoomTileSubtitle.tsx | 2 +- .../components/FormattingButtons.tsx | 22 ++--- .../devices/DeviceExpandDetailsButton.tsx | 2 +- .../tabs/room/PeopleRoomSettingsTab.tsx | 4 +- .../tabs/user/SidebarUserSettingsTab.tsx | 6 +- .../views/spaces/QuickSettingsButton.tsx | 6 +- .../components/atoms/VoiceBroadcastError.tsx | 3 +- .../components/atoms/VoiceBroadcastHeader.tsx | 4 +- .../atoms/VoiceBroadcastPlaybackControl.tsx | 4 +- ...VoiceBroadcastRecordingConnectionError.tsx | 2 +- .../molecules/VoiceBroadcastRecordingPip.tsx | 4 +- .../VoiceBroadcastSmallPlaybackBody.tsx | 2 +- 230 files changed, 246 insertions(+), 939 deletions(-) delete mode 100644 res/img/cancel-small.svg delete mode 100644 res/img/cancel.svg delete mode 100644 res/img/compound/checkbox-32px.svg delete mode 100644 res/img/compound/close-16px.svg delete mode 100644 res/img/compound/close-8px.svg delete mode 100644 res/img/compound/error-16px.svg delete mode 100644 res/img/compound/mic-16px.svg delete mode 100644 res/img/compound/pause-12.svg delete mode 100644 res/img/compound/play-16.svg delete mode 100644 res/img/compound/thread-16px.svg delete mode 100644 res/img/compound/user.svg delete mode 100644 res/img/e2e/disabled.svg delete mode 100644 res/img/element-icons/Email-icon.svg delete mode 100644 res/img/element-icons/Mic-off.svg delete mode 100644 res/img/element-icons/Record.svg delete mode 100644 res/img/element-icons/Stop.svg delete mode 100644 res/img/element-icons/back.svg delete mode 100644 res/img/element-icons/brands/element.svg delete mode 100644 res/img/element-icons/cancel-rounded.svg delete mode 100644 res/img/element-icons/caret-left.svg delete mode 100644 res/img/element-icons/check-white.svg delete mode 100644 res/img/element-icons/check.svg delete mode 100644 res/img/element-icons/context-menu.svg delete mode 100644 res/img/element-icons/copy.svg delete mode 100644 res/img/element-icons/devices.svg delete mode 100644 res/img/element-icons/export.svg delete mode 100644 res/img/element-icons/home.svg delete mode 100644 res/img/element-icons/info.svg delete mode 100644 res/img/element-icons/leave.svg delete mode 100644 res/img/element-icons/link.svg delete mode 100644 res/img/element-icons/location.svg delete mode 100644 res/img/element-icons/lock.svg delete mode 100644 res/img/element-icons/maximise-expand.svg delete mode 100644 res/img/element-icons/message/chevron-up.svg delete mode 100644 res/img/element-icons/message/fwd.svg delete mode 100644 res/img/element-icons/message/overflow-large.svg delete mode 100644 res/img/element-icons/message/thread.svg delete mode 100644 res/img/element-icons/mic.svg delete mode 100644 res/img/element-icons/minimise-collapse.svg delete mode 100644 res/img/element-icons/pause.svg delete mode 100644 res/img/element-icons/play.svg delete mode 100644 res/img/element-icons/plus.svg delete mode 100644 res/img/element-icons/qrcode.svg delete mode 100644 res/img/element-icons/retry.svg delete mode 100644 res/img/element-icons/room/apps.svg delete mode 100644 res/img/element-icons/room/composer/bold.svg delete mode 100644 res/img/element-icons/room/composer/bulleted_list.svg delete mode 100644 res/img/element-icons/room/composer/code_block.svg delete mode 100644 res/img/element-icons/room/composer/indent_decrease.svg delete mode 100644 res/img/element-icons/room/composer/indent_increase.svg delete mode 100644 res/img/element-icons/room/composer/inline_code.svg delete mode 100644 res/img/element-icons/room/composer/italic.svg delete mode 100644 res/img/element-icons/room/composer/link.svg delete mode 100644 res/img/element-icons/room/composer/location.svg delete mode 100644 res/img/element-icons/room/composer/numbered_list.svg delete mode 100644 res/img/element-icons/room/composer/quote.svg delete mode 100644 res/img/element-icons/room/composer/rich_text.svg delete mode 100644 res/img/element-icons/room/composer/strikethrough.svg delete mode 100644 res/img/element-icons/room/composer/underline.svg delete mode 100644 res/img/element-icons/room/ellipsis.svg delete mode 100644 res/img/element-icons/room/format-bar/bold.svg delete mode 100644 res/img/element-icons/room/format-bar/code.svg delete mode 100644 res/img/element-icons/room/format-bar/italic.svg delete mode 100644 res/img/element-icons/room/format-bar/quote.svg delete mode 100644 res/img/element-icons/room/format-bar/strikethrough.svg delete mode 100644 res/img/element-icons/room/members.svg delete mode 100644 res/img/element-icons/room/message-bar/reply.svg delete mode 100644 res/img/element-icons/room/room-summary.svg delete mode 100644 res/img/element-icons/room/thread.svg delete mode 100644 res/img/element-icons/roomlist/checkmark.svg delete mode 100644 res/img/element-icons/roomlist/favorite.svg delete mode 100644 res/img/element-icons/roomlist/member-plus.svg delete mode 100644 res/img/element-icons/roomlist/search.svg delete mode 100644 res/img/element-icons/security.svg delete mode 100644 res/img/element-icons/send-message.svg delete mode 100644 res/img/element-icons/settings.svg delete mode 100644 res/img/element-icons/thread-summary.svg delete mode 100644 res/img/element-icons/trashcan.svg delete mode 100644 res/img/element-icons/x-8px.svg delete mode 100644 res/img/ellipsis.svg delete mode 100644 res/img/feather-customised/alert-triangle.svg delete mode 100644 res/img/feather-customised/check.svg delete mode 100644 res/img/feather-customised/chevron-down.svg delete mode 100644 res/img/feather-customised/dropdown-arrow.svg delete mode 100644 res/img/feather-customised/files.svg delete mode 100644 res/img/feather-customised/help-circle.svg delete mode 100644 res/img/feather-customised/image.svg delete mode 100644 res/img/feather-customised/plus.svg delete mode 100644 res/img/feather-customised/search-input.svg delete mode 100644 res/img/feather-customised/trash.custom.svg delete mode 100644 res/img/feather-customised/warning-triangle.svg delete mode 100644 res/img/feather-customised/x.svg delete mode 100644 res/img/format/bold.svg delete mode 100644 res/img/format/code.svg delete mode 100644 res/img/format/italics.svg delete mode 100644 res/img/format/quote.svg delete mode 100644 res/img/format/strikethrough.svg delete mode 100644 res/img/icon-address-delete.svg delete mode 100644 res/img/icon-email-user.svg delete mode 100644 res/img/icon-invite-people.svg delete mode 100644 res/img/icon-return.svg delete mode 100644 res/img/icon_context_delete.svg delete mode 100644 res/img/icons-close.svg delete mode 100644 res/img/icons-create-room.svg delete mode 100644 res/img/icons-room-add.svg delete mode 100644 res/img/image-view/close.svg delete mode 100644 res/img/image-view/more.svg delete mode 100644 res/img/plus.svg delete mode 100644 res/img/tick-circle.svg delete mode 100644 res/img/voip/call-view/cam-off.svg delete mode 100644 res/img/voip/call-view/cam-on.svg delete mode 100644 res/img/voip/call-view/more.svg delete mode 100644 res/img/voip/call-view/screensharing.svg delete mode 100644 res/img/voip/declined-video.svg delete mode 100644 res/img/voip/missed-video.svg diff --git a/res/css/_common.pcss b/res/css/_common.pcss index a454789efc..de8f4b012d 100644 --- a/res/css/_common.pcss +++ b/res/css/_common.pcss @@ -196,7 +196,7 @@ input[type="search"].mx_textinput_icon { /* FIXME THEME - Tint by CSS rather than referencing a duplicate asset */ input[type="text"].mx_textinput_icon.mx_textinput_search, input[type="search"].mx_textinput_icon.mx_textinput_search { - background-image: url("$(res)/img/feather-customised/search-input.svg"); + background-image: url("@vector-im/compound-design-tokens/icons/search.svg"); } /* dont search UI as not all browsers support it, */ @@ -851,7 +851,7 @@ legend { @define-mixin ThreadSummaryIcon { content: ""; display: inline-block; - mask-image: url("$(res)/img/element-icons/thread-summary.svg"); + mask-image: url("@vector-im/compound-design-tokens/icons/threads-solid.svg"); mask-position: center; mask-repeat: no-repeat; mask-size: contain; diff --git a/res/css/components/views/polls/_PollOption.pcss b/res/css/components/views/polls/_PollOption.pcss index 81301f5646..48bd3dbac6 100644 --- a/res/css/components/views/polls/_PollOption.pcss +++ b/res/css/components/views/polls/_PollOption.pcss @@ -72,7 +72,7 @@ limitations under the License. border-width: 2px; border-color: var(--cpd-color-icon-accent-tertiary); background-color: var(--cpd-color-icon-accent-tertiary); - background-image: url("$(res)/img/element-icons/check-white.svg"); + background-image: url("@vector-im/compound-design-tokens/icons/check.svg"); background-size: 12px; background-repeat: no-repeat; background-position: center; diff --git a/res/css/structures/_GenericDropdownMenu.pcss b/res/css/structures/_GenericDropdownMenu.pcss index 1722c7fd2e..b3987ec3fc 100644 --- a/res/css/structures/_GenericDropdownMenu.pcss +++ b/res/css/structures/_GenericDropdownMenu.pcss @@ -33,7 +33,7 @@ limitations under the License. width: 18px; height: 18px; background: currentColor; - mask-image: url("$(res)/img/feather-customised/chevron-down.svg"); + mask-image: url("@vector-im/compound-design-tokens/icons/chevron-down.svg"); mask-size: 100%; mask-repeat: no-repeat; float: right; @@ -111,7 +111,7 @@ limitations under the License. height: 12px; margin-left: -20px; margin-right: 8px; - mask-image: url("$(res)/img/feather-customised/check.svg"); + mask-image: url("@vector-im/compound-design-tokens/icons/check.svg"); mask-size: 100%; mask-repeat: no-repeat; background-color: $primary-content; diff --git a/res/css/structures/_RightPanel.pcss b/res/css/structures/_RightPanel.pcss index f8b5cb4408..1cabe5b707 100644 --- a/res/css/structures/_RightPanel.pcss +++ b/res/css/structures/_RightPanel.pcss @@ -35,7 +35,7 @@ limitations under the License. /** Fixme - factor this out with the main header **/ .mx_RightPanel_threadsButton::before { - mask-image: url("$(res)/img/element-icons/room/thread.svg"); + mask-image: url("@vector-im/compound-design-tokens/icons/threads-solid.svg"); } .mx_RightPanel_notifsButton::before { @@ -44,7 +44,7 @@ limitations under the License. } .mx_RightPanel_roomSummaryButton::before { - mask-image: url("$(res)/img/element-icons/room/room-summary.svg"); + mask-image: url("@vector-im/compound-design-tokens/icons/info-solid.svg"); mask-position: center; } diff --git a/res/css/structures/_RoomSearch.pcss b/res/css/structures/_RoomSearch.pcss index fea292c8ba..5b38995628 100644 --- a/res/css/structures/_RoomSearch.pcss +++ b/res/css/structures/_RoomSearch.pcss @@ -34,7 +34,7 @@ limitations under the License. .mx_RoomSearch_icon { width: 16px; height: 16px; - mask: url("$(res)/img/element-icons/roomlist/search.svg"); + mask: url("@vector-im/compound-design-tokens/icons/search.svg"); mask-repeat: no-repeat; background-color: $secondary-content; margin-left: 7px; diff --git a/res/css/structures/_RoomStatusBar.pcss b/res/css/structures/_RoomStatusBar.pcss index d0bfa9f7f5..01a9753806 100644 --- a/res/css/structures/_RoomStatusBar.pcss +++ b/res/css/structures/_RoomStatusBar.pcss @@ -126,14 +126,14 @@ limitations under the License. } &.mx_RoomStatusBar_unsentCancelAllBtn::before { - mask-image: url("$(res)/img/element-icons/trashcan.svg"); + mask-image: url("@vector-im/compound-design-tokens/icons/delete.svg"); } &.mx_RoomStatusBar_unsentRetry { padding-left: 34px; /* 28px from above, but +6px to account for the wider icon */ &::before { - mask-image: url("$(res)/img/element-icons/retry.svg"); + mask-image: url("@vector-im/compound-design-tokens/icons/restart.svg"); } } } diff --git a/res/css/structures/_RoomView.pcss b/res/css/structures/_RoomView.pcss index 30583384b7..1370203b14 100644 --- a/res/css/structures/_RoomView.pcss +++ b/res/css/structures/_RoomView.pcss @@ -70,7 +70,7 @@ limitations under the License. &::before { background-color: $info-plinth-fg-color; - mask: url("$(res)/img/feather-customised/search-input.svg"); + mask: url("@vector-im/compound-design-tokens/icons/search.svg"); mask-repeat: no-repeat; mask-position: center; mask-size: 50px; diff --git a/res/css/structures/_SearchBox.pcss b/res/css/structures/_SearchBox.pcss index 1323041791..b0bdd64248 100644 --- a/res/css/structures/_SearchBox.pcss +++ b/res/css/structures/_SearchBox.pcss @@ -24,7 +24,7 @@ limitations under the License. .mx_SearchBox_closeButton { cursor: pointer; - background-image: url("$(res)/img/icons-close.svg"); + background-image: url("@vector-im/compound-design-tokens/icons/close.svg"); background-repeat: no-repeat; width: 16px; height: 16px; diff --git a/res/css/structures/_SpaceHierarchy.pcss b/res/css/structures/_SpaceHierarchy.pcss index ca129fdbac..7ae670a183 100644 --- a/res/css/structures/_SpaceHierarchy.pcss +++ b/res/css/structures/_SpaceHierarchy.pcss @@ -129,7 +129,7 @@ limitations under the License. background-color: $tertiary-content; mask-size: 16px; transform: rotate(270deg); - mask-image: url("$(res)/img/feather-customised/chevron-down.svg"); + mask-image: url("@vector-im/compound-design-tokens/icons/chevron-down.svg"); } &.mx_SpaceHierarchy_subspace_toggle_shown::before { @@ -219,7 +219,7 @@ limitations under the License. mask-size: contain; mask-repeat: no-repeat; background-color: $accent; - mask-image: url("$(res)/img/element-icons/roomlist/checkmark.svg"); + mask-image: url("@vector-im/compound-design-tokens/icons/check.svg"); } } } diff --git a/res/css/structures/_SpacePanel.pcss b/res/css/structures/_SpacePanel.pcss index d685617d5b..e2d1f75451 100644 --- a/res/css/structures/_SpacePanel.pcss +++ b/res/css/structures/_SpacePanel.pcss @@ -56,7 +56,7 @@ limitations under the License. mask-size: contain; mask-repeat: no-repeat; background-color: $background; - mask-image: url("$(res)/img/feather-customised/chevron-down.svg"); + mask-image: url("@vector-im/compound-design-tokens/icons/chevron-down.svg"); transform: rotate(270deg); } @@ -177,7 +177,7 @@ limitations under the License. mask-size: 20px; mask-repeat: no-repeat; background-color: $tertiary-content; - mask-image: url("$(res)/img/feather-customised/chevron-down.svg"); + mask-image: url("@vector-im/compound-design-tokens/icons/chevron-down.svg"); } .mx_SpaceButton_icon { @@ -215,15 +215,15 @@ limitations under the License. } &.mx_SpaceButton_home .mx_SpaceButton_icon::before { - mask-image: url("$(res)/img/element-icons/home.svg"); + mask-image: url("@vector-im/compound-design-tokens/icons/home-solid.svg"); } &.mx_SpaceButton_favourites .mx_SpaceButton_icon::before { - mask-image: url("$(res)/img/element-icons/roomlist/favorite.svg"); + mask-image: url("@vector-im/compound-design-tokens/icons/favourite-solid.svg"); } &.mx_SpaceButton_people .mx_SpaceButton_icon::before { - mask-image: url("$(res)/img/element-icons/room/members.svg"); + mask-image: url("@vector-im/compound-design-tokens/icons/user-profile-solid.svg"); } &.mx_SpaceButton_orphans .mx_SpaceButton_icon::before { @@ -237,7 +237,7 @@ limitations under the License. &.mx_SpaceButton_new .mx_SpaceButton_icon { &::before { background-color: $primary-content; - mask-image: url("$(res)/img/element-icons/plus.svg"); + mask-image: url("@vector-im/compound-design-tokens/icons/plus.svg"); transition: all 0.2s ease-in-out; /* TODO transition */ } } @@ -266,7 +266,7 @@ limitations under the License. mask-position: center; mask-size: contain; mask-repeat: no-repeat; - mask-image: url("$(res)/img/element-icons/context-menu.svg"); + mask-image: url("@vector-im/compound-design-tokens/icons/overflow-horizontal.svg"); background: $primary-content; } } @@ -422,7 +422,7 @@ limitations under the License. } .mx_SpacePanel_iconHome::before { - mask-image: url("$(res)/img/element-icons/home.svg"); + mask-image: url("@vector-im/compound-design-tokens/icons/home-solid.svg"); } .mx_SpacePanel_iconInvite::before { @@ -430,19 +430,19 @@ limitations under the License. } .mx_SpacePanel_iconSettings::before { - mask-image: url("$(res)/img/element-icons/settings.svg"); + mask-image: url("@vector-im/compound-design-tokens/icons/settings-solid.svg"); } .mx_SpacePanel_iconLeave::before { - mask-image: url("$(res)/img/element-icons/leave.svg"); + mask-image: url("@vector-im/compound-design-tokens/icons/leave.svg"); } .mx_SpacePanel_iconMembers::before { - mask-image: url("$(res)/img/element-icons/room/members.svg"); + mask-image: url("@vector-im/compound-design-tokens/icons/user-profile-solid.svg"); } .mx_SpacePanel_iconPlus::before { - mask-image: url("$(res)/img/element-icons/plus.svg"); + mask-image: url("@vector-im/compound-design-tokens/icons/plus.svg"); } .mx_SpacePanel_iconExplore::before { diff --git a/res/css/structures/_SpaceRoomView.pcss b/res/css/structures/_SpaceRoomView.pcss index 50f6fc9278..d403cd1aa8 100644 --- a/res/css/structures/_SpaceRoomView.pcss +++ b/res/css/structures/_SpaceRoomView.pcss @@ -229,7 +229,7 @@ limitations under the License. width: 24px; background: $tertiary-content; mask-size: contain; - mask-image: url("$(res)/img/element-icons/settings.svg"); + mask-image: url("@vector-im/compound-design-tokens/icons/settings-solid.svg"); } } } @@ -255,7 +255,7 @@ limitations under the License. } .mx_SpaceRoomView_privateScope_justMeButton::before { - mask-image: url("$(res)/img/element-icons/room/members.svg"); + mask-image: url("@vector-im/compound-design-tokens/icons/user-profile-solid.svg"); } .mx_SpaceRoomView_privateScope_meAndMyTeammatesButton::before { diff --git a/res/css/structures/_UploadBar.pcss b/res/css/structures/_UploadBar.pcss index a0689d4270..8063b53bae 100644 --- a/res/css/structures/_UploadBar.pcss +++ b/res/css/structures/_UploadBar.pcss @@ -63,5 +63,5 @@ limitations under the License. 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"); } diff --git a/res/css/structures/_UserMenu.pcss b/res/css/structures/_UserMenu.pcss index 5f8a6a70a1..ee87890b91 100644 --- a/res/css/structures/_UserMenu.pcss +++ b/res/css/structures/_UserMenu.pcss @@ -177,7 +177,7 @@ limitations under the License. } .mx_UserMenu_iconHome::before { - mask-image: url("$(res)/img/element-icons/home.svg"); + mask-image: url("@vector-im/compound-design-tokens/icons/home-solid.svg"); } .mx_UserMenu_iconDnd::before { @@ -193,11 +193,11 @@ limitations under the License. } .mx_UserMenu_iconLock::before { - mask-image: url("$(res)/img/element-icons/security.svg"); + mask-image: url("@vector-im/compound-design-tokens/icons/lock-solid.svg"); } .mx_UserMenu_iconSettings::before { - mask-image: url("$(res)/img/element-icons/settings.svg"); + mask-image: url("@vector-im/compound-design-tokens/icons/settings-solid.svg"); } .mx_UserMenu_iconMessage::before { @@ -205,7 +205,7 @@ limitations under the License. } .mx_UserMenu_iconSignOut::before { - mask-image: url("$(res)/img/element-icons/leave.svg"); + mask-image: url("@vector-im/compound-design-tokens/icons/leave.svg"); } .mx_UserMenu_iconQr::before { @@ -255,7 +255,7 @@ limitations under the License. position: absolute; width: inherit; height: inherit; - mask-image: url("$(res)/img/feather-customised/x.svg"); + mask-image: url("@vector-im/compound-design-tokens/icons/close.svg"); mask-position: center; mask-size: 12px; mask-repeat: no-repeat; diff --git a/res/css/views/audio_messages/_PlayPauseButton.pcss b/res/css/views/audio_messages/_PlayPauseButton.pcss index 1093fcd3ae..cb3f5a0656 100644 --- a/res/css/views/audio_messages/_PlayPauseButton.pcss +++ b/res/css/views/audio_messages/_PlayPauseButton.pcss @@ -40,7 +40,7 @@ limitations under the License. height: 16px; top: 8px; /* center */ left: 12px; /* center */ - mask-image: url("$(res)/img/element-icons/play.svg"); + mask-image: url("@vector-im/compound-design-tokens/icons/play-solid.svg"); } &.mx_PlayPauseButton_pause::before { @@ -48,6 +48,6 @@ limitations under the License. height: 12px; top: 10px; /* center */ left: 11px; /* center */ - mask-image: url("$(res)/img/element-icons/pause.svg"); + mask-image: url("@vector-im/compound-design-tokens/icons/pause-solid.svg"); } } diff --git a/res/css/views/context_menus/_IconizedContextMenu.pcss b/res/css/views/context_menus/_IconizedContextMenu.pcss index d15e63e9f9..51a2e27195 100644 --- a/res/css/views/context_menus/_IconizedContextMenu.pcss +++ b/res/css/views/context_menus/_IconizedContextMenu.pcss @@ -168,7 +168,7 @@ limitations under the License. } .mx_IconizedContextMenu_checked::before { - mask-image: url("$(res)/img/element-icons/roomlist/checkmark.svg"); + mask-image: url("@vector-im/compound-design-tokens/icons/check.svg"); } .mx_IconizedContextMenu_unchecked::before { diff --git a/res/css/views/context_menus/_MessageContextMenu.pcss b/res/css/views/context_menus/_MessageContextMenu.pcss index be113c770f..b47496a76a 100644 --- a/res/css/views/context_menus/_MessageContextMenu.pcss +++ b/res/css/views/context_menus/_MessageContextMenu.pcss @@ -33,7 +33,7 @@ limitations under the License. } .mx_MessageContextMenu_iconCollapse::before { - mask-image: url("$(res)/img/element-icons/message/chevron-up.svg"); + mask-image: url("@vector-im/compound-design-tokens/icons/chevron-up.svg"); } .mx_MessageContextMenu_iconReport::before { @@ -41,7 +41,7 @@ limitations under the License. } .mx_MessageContextMenu_iconLink::before { - mask-image: url("$(res)/img/element-icons/link.svg"); + mask-image: url("@vector-im/compound-design-tokens/icons/link.svg"); } .mx_MessageContextMenu_iconPermalink::before { @@ -57,27 +57,27 @@ limitations under the License. } .mx_MessageContextMenu_iconEndPoll::before { - mask-image: url("$(res)/img/element-icons/check-white.svg"); + mask-image: url("@vector-im/compound-design-tokens/icons/check.svg"); } .mx_MessageContextMenu_iconForward::before { - mask-image: url("$(res)/img/element-icons/message/fwd.svg"); + mask-image: url("@vector-im/compound-design-tokens/icons/forward.svg"); } .mx_MessageContextMenu_iconRedact::before { - mask-image: url("$(res)/img/element-icons/trashcan.svg"); + mask-image: url("@vector-im/compound-design-tokens/icons/delete.svg"); } .mx_MessageContextMenu_iconResend::before { - mask-image: url("$(res)/img/element-icons/retry.svg"); + mask-image: url("@vector-im/compound-design-tokens/icons/restart.svg"); } .mx_MessageContextMenu_iconSource::before { - mask-image: url("$(res)/img/element-icons/room/format-bar/code.svg"); + mask-image: url("@vector-im/compound-design-tokens/icons/inline-code.svg"); } .mx_MessageContextMenu_iconQuote::before { - mask-image: url("$(res)/img/element-icons/room/format-bar/quote.svg"); + mask-image: url("@vector-im/compound-design-tokens/icons/quote.svg"); } .mx_MessageContextMenu_iconPin::before { @@ -102,11 +102,11 @@ limitations under the License. } .mx_MessageContextMenu_iconReply::before { - mask-image: url("$(res)/img/element-icons/room/message-bar/reply.svg"); + mask-image: url("@vector-im/compound-design-tokens/icons/reply.svg"); } .mx_MessageContextMenu_iconReplyInThread::before { - mask-image: url("$(res)/img/element-icons/message/thread.svg"); + mask-image: url("@vector-im/compound-design-tokens/icons/threads.svg"); } .mx_MessageContextMenu_iconReact::before { diff --git a/res/css/views/context_menus/_RoomGeneralContextMenu.pcss b/res/css/views/context_menus/_RoomGeneralContextMenu.pcss index 4017a53f20..8701f48fb8 100644 --- a/res/css/views/context_menus/_RoomGeneralContextMenu.pcss +++ b/res/css/views/context_menus/_RoomGeneralContextMenu.pcss @@ -1,5 +1,5 @@ .mx_RoomGeneralContextMenu_iconStar::before { - mask-image: url("$(res)/img/element-icons/roomlist/favorite.svg"); + mask-image: url("@vector-im/compound-design-tokens/icons/favourite-solid.svg"); } .mx_RoomGeneralContextMenu_iconArrowDown::before { @@ -31,7 +31,7 @@ } .mx_RoomGeneralContextMenu_iconPeople::before { - mask-image: url("$(res)/img/element-icons/room/members.svg"); + mask-image: url("@vector-im/compound-design-tokens/icons/user-profile-solid.svg"); } .mx_RoomGeneralContextMenu_iconFiles::before { @@ -43,15 +43,15 @@ } .mx_RoomGeneralContextMenu_iconWidgets::before { - mask-image: url("$(res)/img/element-icons/room/apps.svg"); + mask-image: url("@vector-im/compound-design-tokens/icons/extensions-solid.svg.svg"); } .mx_RoomGeneralContextMenu_iconSettings::before { - mask-image: url("$(res)/img/element-icons/settings.svg"); + mask-image: url("@vector-im/compound-design-tokens/icons/settings-solid.svg"); } .mx_RoomGeneralContextMenu_iconExport::before { - mask-image: url("$(res)/img/element-icons/export.svg"); + mask-image: url("@vector-im/compound-design-tokens/icons/export-archive.svg"); } .mx_RoomGeneralContextMenu_iconDeveloperTools::before { @@ -59,7 +59,7 @@ } .mx_RoomGeneralContextMenu_iconCopyLink::before { - mask-image: url("$(res)/img/element-icons/link.svg"); + mask-image: url("@vector-im/compound-design-tokens/icons/link.svg"); } .mx_RoomGeneralContextMenu_iconInvite::before { @@ -67,5 +67,5 @@ } .mx_RoomGeneralContextMenu_iconSignOut::before { - mask-image: url("$(res)/img/element-icons/leave.svg"); + mask-image: url("@vector-im/compound-design-tokens/icons/leave.svg"); } diff --git a/res/css/views/dialogs/_AddExistingToSpaceDialog.pcss b/res/css/views/dialogs/_AddExistingToSpaceDialog.pcss index 87372e6c47..9a0829c7fc 100644 --- a/res/css/views/dialogs/_AddExistingToSpaceDialog.pcss +++ b/res/css/views/dialogs/_AddExistingToSpaceDialog.pcss @@ -133,7 +133,7 @@ limitations under the License. mask-repeat: no-repeat; mask-position: center; mask-size: contain; - mask-image: url("$(res)/img/element-icons/retry.svg"); + mask-image: url("@vector-im/compound-design-tokens/icons/restart.svg"); width: 18px; height: 18px; left: 0; @@ -205,7 +205,7 @@ limitations under the License. mask-size: contain; mask-repeat: no-repeat; background-color: $accent; - mask-image: url("$(res)/img/element-icons/roomlist/checkmark.svg"); + mask-image: url("@vector-im/compound-design-tokens/icons/check.svg"); } } } diff --git a/res/css/views/dialogs/_AnalyticsLearnMoreDialog.pcss b/res/css/views/dialogs/_AnalyticsLearnMoreDialog.pcss index 06bbe579ef..d0d28c07bb 100644 --- a/res/css/views/dialogs/_AnalyticsLearnMoreDialog.pcss +++ b/res/css/views/dialogs/_AnalyticsLearnMoreDialog.pcss @@ -44,7 +44,7 @@ limitations under the License. } .mx_AnalyticsLearnMore_bullets li { - background: url("$(res)/img/tick-circle.svg") no-repeat; + background: url("@vector-im/compound-design-tokens/icons/check-circle.svg") no-repeat; list-style-type: none; padding: 2px 0px 20px 32px; vertical-align: middle; diff --git a/res/css/views/dialogs/_ConfirmSpaceUserActionDialog.pcss b/res/css/views/dialogs/_ConfirmSpaceUserActionDialog.pcss index a7ef9e1c88..392b52a324 100644 --- a/res/css/views/dialogs/_ConfirmSpaceUserActionDialog.pcss +++ b/res/css/views/dialogs/_ConfirmSpaceUserActionDialog.pcss @@ -59,7 +59,7 @@ limitations under the License. background-color: $secondary-content; mask-repeat: no-repeat; mask-size: contain; - mask-image: url("$(res)/img/element-icons/room/room-summary.svg"); + mask-image: url("@vector-im/compound-design-tokens/icons/info-solid.svg"); mask-position: center; } } diff --git a/res/css/views/dialogs/_InviteDialog.pcss b/res/css/views/dialogs/_InviteDialog.pcss index aedb1b2507..586917c07d 100644 --- a/res/css/views/dialogs/_InviteDialog.pcss +++ b/res/css/views/dialogs/_InviteDialog.pcss @@ -356,7 +356,7 @@ limitations under the License. height: 24px; grid-column: 1; grid-row: 1; - mask-image: url("$(res)/img/feather-customised/check.svg"); + mask-image: url("@vector-im/compound-design-tokens/icons/check.svg"); mask-size: 100%; mask-repeat: no-repeat; position: absolute; diff --git a/res/css/views/dialogs/_JoinRuleDropdown.pcss b/res/css/views/dialogs/_JoinRuleDropdown.pcss index da0796edea..fe92ba719f 100644 --- a/res/css/views/dialogs/_JoinRuleDropdown.pcss +++ b/res/css/views/dialogs/_JoinRuleDropdown.pcss @@ -49,7 +49,7 @@ limitations under the License. .mx_JoinRuleDropdown_invite::before { box-sizing: border-box; - mask-image: url("$(res)/img/element-icons/lock.svg"); + mask-image: url("@vector-im/compound-design-tokens/icons/lock-solid.svg"); mask-size: contain; padding: 1px; } diff --git a/res/css/views/dialogs/_LeaveSpaceDialog.pcss b/res/css/views/dialogs/_LeaveSpaceDialog.pcss index f06cc9a46c..8d9ce72e5f 100644 --- a/res/css/views/dialogs/_LeaveSpaceDialog.pcss +++ b/res/css/views/dialogs/_LeaveSpaceDialog.pcss @@ -53,7 +53,7 @@ limitations under the License. background-color: $secondary-content; mask-repeat: no-repeat; mask-size: contain; - mask-image: url("$(res)/img/element-icons/room/room-summary.svg"); + mask-image: url("@vector-im/compound-design-tokens/icons/info-solid.svg"); mask-position: center; } } diff --git a/res/css/views/dialogs/_ManageRestrictedJoinRuleDialog.pcss b/res/css/views/dialogs/_ManageRestrictedJoinRuleDialog.pcss index 501d7a2aaf..443e94186b 100644 --- a/res/css/views/dialogs/_ManageRestrictedJoinRuleDialog.pcss +++ b/res/css/views/dialogs/_ManageRestrictedJoinRuleDialog.pcss @@ -116,7 +116,7 @@ limitations under the License. background-color: $secondary-content; mask-repeat: no-repeat; mask-size: contain; - mask-image: url("$(res)/img/element-icons/room/room-summary.svg"); + mask-image: url("@vector-im/compound-design-tokens/icons/info-solid.svg"); mask-position: center; } } diff --git a/res/css/views/dialogs/_PollCreateDialog.pcss b/res/css/views/dialogs/_PollCreateDialog.pcss index 46ef43cd08..deadb9a5d3 100644 --- a/res/css/views/dialogs/_PollCreateDialog.pcss +++ b/res/css/views/dialogs/_PollCreateDialog.pcss @@ -60,7 +60,7 @@ limitations under the License. &::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; diff --git a/res/css/views/dialogs/_RoomSettingsDialog.pcss b/res/css/views/dialogs/_RoomSettingsDialog.pcss index b0a08919aa..33a81cb72a 100644 --- a/res/css/views/dialogs/_RoomSettingsDialog.pcss +++ b/res/css/views/dialogs/_RoomSettingsDialog.pcss @@ -18,7 +18,7 @@ limitations under the License. /* ========================================================== */ .mx_RoomSettingsDialog_settingsIcon::before { - mask-image: url("$(res)/img/element-icons/settings.svg"); + mask-image: url("@vector-im/compound-design-tokens/icons/settings-solid.svg"); } .mx_RoomSettingsDialog_voiceIcon::before { @@ -26,7 +26,7 @@ limitations under the License. } .mx_RoomSettingsDialog_securityIcon::before { - mask-image: url("$(res)/img/element-icons/security.svg"); + mask-image: url("@vector-im/compound-design-tokens/icons/lock-solid.svg"); } .mx_RoomSettingsDialog_rolesIcon::before { @@ -65,7 +65,7 @@ limitations under the License. /* show a different AvatarSetting placeholder for RoomProfileSettings which is basically a clone of ProfileSettings */ .mx_RoomSettingsDialog .mx_AvatarSetting_avatar .mx_AvatarSetting_avatarPlaceholder::before { - mask: url("$(res)/img/feather-customised/image.svg"); + mask: url("@vector-im/compound-design-tokens/icons/image.svg"); mask-repeat: no-repeat; mask-size: 36px; mask-position: center; diff --git a/res/css/views/dialogs/_SpaceSettingsDialog.pcss b/res/css/views/dialogs/_SpaceSettingsDialog.pcss index 9d4dada646..7ecaf503ed 100644 --- a/res/css/views/dialogs/_SpaceSettingsDialog.pcss +++ b/res/css/views/dialogs/_SpaceSettingsDialog.pcss @@ -82,7 +82,7 @@ limitations under the License. .mx_TabbedView_tabLabel { .mx_SpaceSettingsDialog_generalIcon::before { - mask-image: url("$(res)/img/element-icons/settings.svg"); + mask-image: url("@vector-im/compound-design-tokens/icons/settings-solid.svg"); } .mx_SpaceSettingsDialog_visibilityIcon::before { diff --git a/res/css/views/dialogs/_SpotlightDialog.pcss b/res/css/views/dialogs/_SpotlightDialog.pcss index 32c14bca9d..e93ba89422 100644 --- a/res/css/views/dialogs/_SpotlightDialog.pcss +++ b/res/css/views/dialogs/_SpotlightDialog.pcss @@ -101,7 +101,7 @@ limitations under the License. } &.mx_SpotlightDialog_filterPeople::before { - mask-image: url("$(res)/img/element-icons/room/members.svg"); + mask-image: url("@vector-im/compound-design-tokens/icons/user-profile-solid.svg"); } &.mx_SpotlightDialog_filterPublicRooms::before { @@ -136,7 +136,7 @@ limitations under the License. left: 50%; top: 50%; transform: translate(-50%, -50%); - mask-image: url("$(res)/img/cancel-small.svg"); + mask-image: url("@vector-im/compound-design-tokens/icons/close.svg"); } } } @@ -366,7 +366,7 @@ limitations under the License. } .mx_SpotlightDialog_option--menu::before { - mask-image: url("$(res)/img/element-icons/context-menu.svg"); + mask-image: url("@vector-im/compound-design-tokens/icons/overflow-horizontal.svg"); } &:hover, @@ -410,7 +410,7 @@ limitations under the License. } .mx_SpotlightDialog_inviteLink .mx_AccessibleButton::before { - mask-image: url("$(res)/img/element-icons/link.svg"); + mask-image: url("@vector-im/compound-design-tokens/icons/link.svg"); } .mx_SpotlightDialog_createRoom .mx_AccessibleButton::before { @@ -442,7 +442,7 @@ limitations under the License. } .mx_SpotlightDialog_startChat::before { - mask-image: url("$(res)/img/element-icons/room/members.svg"); + mask-image: url("@vector-im/compound-design-tokens/icons/user-profile-solid.svg"); } .mx_SpotlightDialog_joinRoomAlias::before { @@ -518,15 +518,15 @@ limitations under the License. mask-size: contain; &.mx_SpotlightDialog_metaspaceResult_home-space { - mask-image: url("$(res)/img/element-icons/home.svg"); + mask-image: url("@vector-im/compound-design-tokens/icons/home-solid.svg"); } &.mx_SpotlightDialog_metaspaceResult_favourites-space { - mask-image: url("$(res)/img/element-icons/roomlist/favorite.svg"); + mask-image: url("@vector-im/compound-design-tokens/icons/favourite-solid.svg"); } &.mx_SpotlightDialog_metaspaceResult_people-space { - mask-image: url("$(res)/img/element-icons/room/members.svg"); + mask-image: url("@vector-im/compound-design-tokens/icons/user-profile-solid.svg"); } &.mx_SpotlightDialog_metaspaceResult_orphans-space { diff --git a/res/css/views/dialogs/_UserSettingsDialog.pcss b/res/css/views/dialogs/_UserSettingsDialog.pcss index 6c09e90886..8bcf87c789 100644 --- a/res/css/views/dialogs/_UserSettingsDialog.pcss +++ b/res/css/views/dialogs/_UserSettingsDialog.pcss @@ -35,7 +35,7 @@ limitations under the License. /* ========================================================== */ .mx_UserSettingsDialog_settingsIcon::before { - mask-image: url("$(res)/img/element-icons/settings.svg"); + mask-image: url("@vector-im/compound-design-tokens/icons/settings-solid.svg"); } .mx_UserSettingsDialog_appearanceIcon::before { @@ -63,11 +63,11 @@ limitations under the License. } .mx_UserSettingsDialog_securityIcon::before { - mask-image: url("$(res)/img/element-icons/security.svg"); + mask-image: url("@vector-im/compound-design-tokens/icons/lock-solid.svg"); } .mx_UserSettingsDialog_sessionsIcon::before { - mask-image: url("$(res)/img/element-icons/settings/devices.svg"); + mask-image: url("@vector-im/compound-design-tokens/icons/devices.svg"); } .mx_UserSettingsDialog_helpIcon::before { diff --git a/res/css/views/dialogs/security/_AccessSecretStorageDialog.pcss b/res/css/views/dialogs/security/_AccessSecretStorageDialog.pcss index 82e490c781..57c945278b 100644 --- a/res/css/views/dialogs/security/_AccessSecretStorageDialog.pcss +++ b/res/css/views/dialogs/security/_AccessSecretStorageDialog.pcss @@ -88,7 +88,7 @@ limitations under the License. color: $accent; &::before { - mask-image: url("$(res)/img/feather-customised/check.svg"); + mask-image: url("@vector-im/compound-design-tokens/icons/check.svg"); background-color: $accent; } } @@ -97,7 +97,7 @@ limitations under the License. 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; } } diff --git a/res/css/views/directory/_NetworkDropdown.pcss b/res/css/views/directory/_NetworkDropdown.pcss index 8dbd7f020d..5e841d929b 100644 --- a/res/css/views/directory/_NetworkDropdown.pcss +++ b/res/css/views/directory/_NetworkDropdown.pcss @@ -79,7 +79,7 @@ limitations under the License. left: 50%; top: 50%; transform: translate(-50%, -50%); - mask-image: url("$(res)/img/cancel-small.svg"); + mask-image: url("@vector-im/compound-design-tokens/icons/close.svg"); } } diff --git a/res/css/views/elements/_AccessibleButton.pcss b/res/css/views/elements/_AccessibleButton.pcss index 236cd03abf..fdf40a5d0e 100644 --- a/res/css/views/elements/_AccessibleButton.pcss +++ b/res/css/views/elements/_AccessibleButton.pcss @@ -72,7 +72,7 @@ limitations under the License. background-color: var(--cpd-color-bg-action-primary-rest); &::before { - mask-image: url("$(res)/img/feather-customised/check.svg"); + mask-image: url("@vector-im/compound-design-tokens/icons/check.svg"); } } @@ -80,7 +80,7 @@ limitations under the License. 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"); } } diff --git a/res/css/views/elements/_Dropdown.pcss b/res/css/views/elements/_Dropdown.pcss index 4bc7860806..29e86b7fb5 100644 --- a/res/css/views/elements/_Dropdown.pcss +++ b/res/css/views/elements/_Dropdown.pcss @@ -50,7 +50,7 @@ limitations under the License. width: 10px; height: 6px; padding-right: 9px; - mask: url("$(res)/img/feather-customised/dropdown-arrow.svg"); + mask: url("@vector-im/compound-design-tokens/icons/chevron-down.svg"); mask-repeat: no-repeat; background: $primary-content; } diff --git a/res/css/views/elements/_FacePile.pcss b/res/css/views/elements/_FacePile.pcss index dd62290955..145519d36f 100644 --- a/res/css/views/elements/_FacePile.pcss +++ b/res/css/views/elements/_FacePile.pcss @@ -36,7 +36,7 @@ limitations under the License. mask-position: center; mask-size: 20px; mask-repeat: no-repeat; - mask-image: url("$(res)/img/element-icons/room/ellipsis.svg"); + mask-image: url("@vector-im/compound-design-tokens/icons/overflow-horizontal.svg"); } } diff --git a/res/css/views/elements/_Field.pcss b/res/css/views/elements/_Field.pcss index 149ea054f6..a91bc012af 100644 --- a/res/css/views/elements/_Field.pcss +++ b/res/css/views/elements/_Field.pcss @@ -64,7 +64,7 @@ limitations under the License. right: 10px; width: 10px; height: 6px; - mask: url("$(res)/img/feather-customised/dropdown-arrow.svg"); + mask: url("@vector-im/compound-design-tokens/icons/chevron-down.svg"); mask-repeat: no-repeat; background-color: $primary-content; z-index: 1; diff --git a/res/css/views/elements/_ImageView.pcss b/res/css/views/elements/_ImageView.pcss index f67f8a1262..349ce4a6ef 100644 --- a/res/css/views/elements/_ImageView.pcss +++ b/res/css/views/elements/_ImageView.pcss @@ -137,7 +137,7 @@ $button-gap: 24px; } .mx_ImageView_button_more::before { - mask-image: url("$(res)/img/image-view/more.svg"); + mask-image: url("@vector-im/compound-design-tokens/icons/overflow-horizontal.svg"); } .mx_ImageView_button_close { @@ -147,7 +147,7 @@ $button-gap: 24px; &::before { width: $button-size; height: $button-size; - mask-image: url("$(res)/img/image-view/close.svg"); + mask-image: url("@vector-im/compound-design-tokens/icons/close.svg"); mask-size: 40%; } } diff --git a/res/css/views/elements/_InfoTooltip.pcss b/res/css/views/elements/_InfoTooltip.pcss index 566abea29c..d6fa4ef87d 100644 --- a/res/css/views/elements/_InfoTooltip.pcss +++ b/res/css/views/elements/_InfoTooltip.pcss @@ -33,7 +33,7 @@ limitations under the License. } .mx_InfoTooltip_icon_info::before { - mask-image: url("$(res)/img/element-icons/info.svg"); + mask-image: url("@vector-im/compound-design-tokens/icons/info.svg"); } .mx_InfoTooltip_icon_warning::before { diff --git a/res/css/views/elements/_StyledCheckbox.pcss b/res/css/views/elements/_StyledCheckbox.pcss index 66cc13279b..b00a732aee 100644 --- a/res/css/views/elements/_StyledCheckbox.pcss +++ b/res/css/views/elements/_StyledCheckbox.pcss @@ -51,7 +51,7 @@ limitations under the License. height: 100%; width: 100%; - mask-image: url("$(res)/img/feather-customised/check.svg"); + mask-image: url("@vector-im/compound-design-tokens/icons/check.svg"); mask-position: center; mask-size: 100%; mask-repeat: no-repeat; diff --git a/res/css/views/elements/_UseCaseSelectionButton.pcss b/res/css/views/elements/_UseCaseSelectionButton.pcss index 2ca7f6c9cf..1113969215 100644 --- a/res/css/views/elements/_UseCaseSelectionButton.pcss +++ b/res/css/views/elements/_UseCaseSelectionButton.pcss @@ -88,7 +88,7 @@ limitations under the License. width: 12px; height: 12px; - mask-image: url("$(res)/img/element-icons/check-white.svg"); + mask-image: url("@vector-im/compound-design-tokens/icons/check.svg"); } } diff --git a/res/css/views/elements/_Validation.pcss b/res/css/views/elements/_Validation.pcss index 298c75da33..f0da16b359 100644 --- a/res/css/views/elements/_Validation.pcss +++ b/res/css/views/elements/_Validation.pcss @@ -53,7 +53,7 @@ limitations under the License. color: $accent; &::before { - mask-image: url("$(res)/img/feather-customised/check.svg"); + mask-image: url("@vector-im/compound-design-tokens/icons/check.svg"); background-color: $accent; } } @@ -62,7 +62,7 @@ limitations under the License. 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; } } diff --git a/res/css/views/messages/_DateSeparator.pcss b/res/css/views/messages/_DateSeparator.pcss index 39cffc0f33..b497a90cc4 100644 --- a/res/css/views/messages/_DateSeparator.pcss +++ b/res/css/views/messages/_DateSeparator.pcss @@ -38,6 +38,6 @@ limitations under the License. mask-position: center; mask-size: contain; mask-repeat: no-repeat; - mask-image: url("$(res)/img/feather-customised/chevron-down.svg"); + mask-image: url("@vector-im/compound-design-tokens/icons/chevron-down.svg"); background-color: var(--cpd-color-icon-secondary); } diff --git a/res/css/views/messages/_LegacyCallEvent.pcss b/res/css/views/messages/_LegacyCallEvent.pcss index 4b8c6a73c4..9c0d8de59a 100644 --- a/res/css/views/messages/_LegacyCallEvent.pcss +++ b/res/css/views/messages/_LegacyCallEvent.pcss @@ -83,7 +83,7 @@ limitations under the License. &.mx_LegacyCallEvent_rejected, &.mx_LegacyCallEvent_noAnswer { .mx_LegacyCallEvent_type_icon::before { - mask-image: url("$(res)/img/voip/declined-video.svg"); + mask-image: url("@vector-im/compound-design-tokens/icons/video-call-declined-solid.svg"); } } } @@ -97,7 +97,7 @@ limitations under the License. &.mx_LegacyCallEvent_video { .mx_LegacyCallEvent_type_icon::before { - mask-image: url("$(res)/img/voip/missed-video.svg"); + mask-image: url("@vector-im/compound-design-tokens/icons/video-call-missed-solid.svg"); } } } diff --git a/res/css/views/messages/_RedactedBody.pcss b/res/css/views/messages/_RedactedBody.pcss index 3db5744687..44ebbcff09 100644 --- a/res/css/views/messages/_RedactedBody.pcss +++ b/res/css/views/messages/_RedactedBody.pcss @@ -24,7 +24,7 @@ limitations under the License. height: 14px; width: 14px; background-color: $icon-button-color; - mask-image: url("$(res)/img/feather-customised/trash.custom.svg"); + mask-image: url("@vector-im/compound-design-tokens/icons/delete.svg"); mask-repeat: no-repeat; mask-position: center; mask-size: contain; diff --git a/res/css/views/messages/_ViewSourceEvent.pcss b/res/css/views/messages/_ViewSourceEvent.pcss index 0b76ed5953..fafd0f3fdc 100644 --- a/res/css/views/messages/_ViewSourceEvent.pcss +++ b/res/css/views/messages/_ViewSourceEvent.pcss @@ -45,7 +45,7 @@ limitations under the License. width: var(--ViewSourceEvent_toggle-size); min-width: var(--ViewSourceEvent_toggle-size); background-color: $accent; - mask-image: url("$(res)/img/element-icons/maximise-expand.svg"); + mask-image: url("@vector-im/compound-design-tokens/icons/expand.svg"); .mx_EventTile:hover & { visibility: visible; @@ -57,6 +57,6 @@ limitations under the License. height: var(--ViewSourceEvent_toggle-size); mask-position: 0 bottom; margin-bottom: 5px; - mask-image: url("$(res)/img/element-icons/minimise-collapse.svg"); + mask-image: url("@vector-im/compound-design-tokens/icons/collapse.svg"); } } diff --git a/res/css/views/right_panel/_BaseCard.pcss b/res/css/views/right_panel/_BaseCard.pcss index 692f7d23b3..dd3f05dd74 100644 --- a/res/css/views/right_panel/_BaseCard.pcss +++ b/res/css/views/right_panel/_BaseCard.pcss @@ -80,7 +80,7 @@ limitations under the License. width: 100%; mask-repeat: no-repeat; mask-position: center; - mask-image: url("$(res)/img/element-icons/message/overflow-large.svg"); + mask-image: url("@vector-im/compound-design-tokens/icons/overflow-horizontal.svg"); background-color: $secondary-content; } diff --git a/res/css/views/right_panel/_RoomSummaryCard.pcss b/res/css/views/right_panel/_RoomSummaryCard.pcss index 549eb69ee4..4db4cbad7f 100644 --- a/res/css/views/right_panel/_RoomSummaryCard.pcss +++ b/res/css/views/right_panel/_RoomSummaryCard.pcss @@ -169,7 +169,7 @@ limitations under the License. &::before { mask-size: 14px; - mask-image: url("$(res)/img/element-icons/maximise-expand.svg"); + mask-image: url("@vector-im/compound-design-tokens/icons/expand.svg"); } } @@ -177,7 +177,7 @@ limitations under the License. right: 56px; /* 2*24 + 8 */ display: none; &::before { - mask-image: url("$(res)/img/element-icons/room/ellipsis.svg"); + mask-image: url("@vector-im/compound-design-tokens/icons/overflow-horizontal.svg"); } } diff --git a/res/css/views/right_panel/_ThreadPanel.pcss b/res/css/views/right_panel/_ThreadPanel.pcss index 104430c190..e084e277f0 100644 --- a/res/css/views/right_panel/_ThreadPanel.pcss +++ b/res/css/views/right_panel/_ThreadPanel.pcss @@ -52,7 +52,7 @@ limitations under the License. width: 18px; height: 18px; background: currentColor; - mask-image: url("$(res)/img/feather-customised/chevron-down.svg"); + mask-image: url("@vector-im/compound-design-tokens/icons/chevron-down.svg"); mask-size: 100%; mask-repeat: no-repeat; float: right; @@ -165,7 +165,7 @@ limitations under the License. } .mx_ThreadPanel_copyLinkToThread::before { - mask-image: url("$(res)/img/element-icons/link.svg"); + mask-image: url("@vector-im/compound-design-tokens/icons/link.svg"); } .mx_ThreadPanel_empty { @@ -257,7 +257,7 @@ limitations under the License. width: 12px; height: 12px; margin-right: 8px; - mask-image: url("$(res)/img/feather-customised/check.svg"); + mask-image: url("@vector-im/compound-design-tokens/icons/check.svg"); mask-size: 100%; mask-repeat: no-repeat; background-color: $primary-content; diff --git a/res/css/views/rooms/_EventTile.pcss b/res/css/views/rooms/_EventTile.pcss index 46f0ba900f..27a1d39dcc 100644 --- a/res/css/views/rooms/_EventTile.pcss +++ b/res/css/views/rooms/_EventTile.pcss @@ -969,11 +969,11 @@ $left-gutter: 64px; } .mx_EventTile_collapseButton { - mask-image: url("$(res)/img/element-icons/minimise-collapse.svg"); + mask-image: url("@vector-im/compound-design-tokens/icons/collapse.svg"); } .mx_EventTile_expandButton { - mask-image: url("$(res)/img/element-icons/maximise-expand.svg"); + mask-image: url("@vector-im/compound-design-tokens/icons/expand.svg"); } .mx_EventTile_tileError { diff --git a/res/css/views/rooms/_JumpToBottomButton.pcss b/res/css/views/rooms/_JumpToBottomButton.pcss index 5bf2c0c0ba..9f1fe14bc0 100644 --- a/res/css/views/rooms/_JumpToBottomButton.pcss +++ b/res/css/views/rooms/_JumpToBottomButton.pcss @@ -62,7 +62,7 @@ limitations under the License. content: ""; position: absolute; inset: 0; - mask-image: url("$(res)/img/element-icons/message/chevron-up.svg"); + mask-image: url("@vector-im/compound-design-tokens/icons/chevron-up.svg"); mask-repeat: no-repeat; mask-size: 20px; mask-position: center 6px; diff --git a/res/css/views/rooms/_LegacyRoomHeader.pcss b/res/css/views/rooms/_LegacyRoomHeader.pcss index a570b0435a..cf43d3917e 100644 --- a/res/css/views/rooms/_LegacyRoomHeader.pcss +++ b/res/css/views/rooms/_LegacyRoomHeader.pcss @@ -104,7 +104,7 @@ limitations under the License. mask-position: center; mask-size: 20px; mask-repeat: no-repeat; - mask-image: url("$(res)/img/feather-customised/chevron-down.svg"); + mask-image: url("@vector-im/compound-design-tokens/icons/chevron-down.svg"); background-color: $tertiary-content; } @@ -246,12 +246,12 @@ limitations under the License. } .mx_LegacyRoomHeader_forgetButton::before { - mask-image: url("$(res)/img/element-icons/leave.svg"); + mask-image: url("@vector-im/compound-design-tokens/icons/leave.svg"); width: 26px; } .mx_LegacyRoomHeader_appsButton::before { - mask-image: url("$(res)/img/element-icons/room/apps.svg"); + mask-image: url("@vector-im/compound-design-tokens/icons/extensions-solid.svgvg"); } .mx_LegacyRoomHeader_appsButton_highlight::before { @@ -291,7 +291,7 @@ limitations under the License. .mx_LegacyRoomHeader_closeButton { &::before { - mask-image: url("$(res)/img/cancel.svg"); + mask-image: url("@vector-im/compound-design-tokens/icons/close.svg"); mask-size: 20px; mask-position: center; } diff --git a/res/css/views/rooms/_MessageComposer.pcss b/res/css/views/rooms/_MessageComposer.pcss index d88350e946..2e6f48aca9 100644 --- a/res/css/views/rooms/_MessageComposer.pcss +++ b/res/css/views/rooms/_MessageComposer.pcss @@ -262,7 +262,7 @@ limitations under the License. } .mx_MessageComposer_voiceMessage::before { - mask-image: url("$(res)/img/element-icons/mic.svg"); + mask-image: url("@vector-im/compound-design-tokens/icons/mic-on-solid.svg"); } .mx_MessageComposer_voiceBroadcast::before { @@ -274,11 +274,11 @@ limitations under the License. } .mx_MessageComposer_rich_text::before { - mask-image: url("$(res)/img/element-icons/room/composer/rich_text.svg"); + mask-image: url("@vector-im/compound-design-tokens/icons/text-formatting.svg"); } .mx_MessageComposer_location::before { - mask-image: url("$(res)/img/element-icons/room/composer/location.svg"); + mask-image: url("@vector-im/compound-design-tokens/icons/location-pin-solid.svg"); } .mx_MessageComposer_stickers::before { @@ -286,7 +286,7 @@ limitations under the License. } .mx_MessageComposer_buttonMenu::before { - mask-image: url("$(res)/img/image-view/more.svg"); + mask-image: url("@vector-im/compound-design-tokens/icons/overflow-horizontal.svg"); } .mx_MessageComposer_sendMessage { @@ -304,7 +304,7 @@ limitations under the License. top: 8px; left: 9px; - mask-image: url("$(res)/img/element-icons/send-message.svg"); + mask-image: url("@vector-im/compound-design-tokens/icons/send-solid.svg"); mask-repeat: no-repeat; mask-size: contain; mask-position: center; diff --git a/res/css/views/rooms/_MessageComposerFormatBar.pcss b/res/css/views/rooms/_MessageComposerFormatBar.pcss index 1cbabecc3a..fe5d95d7f1 100644 --- a/res/css/views/rooms/_MessageComposerFormatBar.pcss +++ b/res/css/views/rooms/_MessageComposerFormatBar.pcss @@ -71,27 +71,27 @@ limitations under the License. } .mx_MessageComposerFormatBar_buttonIconBold::after { - mask-image: url("$(res)/img/element-icons/room/format-bar/bold.svg"); + mask-image: url("@vector-im/compound-design-tokens/icons/bold.svg"); } .mx_MessageComposerFormatBar_buttonIconItalic::after { - mask-image: url("$(res)/img/element-icons/room/format-bar/italic.svg"); + mask-image: url("@vector-im/compound-design-tokens/icons/italic.svg"); } .mx_MessageComposerFormatBar_buttonIconStrikethrough::after { - mask-image: url("$(res)/img/element-icons/room/format-bar/strikethrough.svg"); + mask-image: url("@vector-im/compound-design-tokens/icons/strikethrough.svg"); } .mx_MessageComposerFormatBar_buttonIconQuote::after { - mask-image: url("$(res)/img/element-icons/room/format-bar/quote.svg"); + mask-image: url("@vector-im/compound-design-tokens/icons/quote.svg"); } .mx_MessageComposerFormatBar_buttonIconCode::after { - mask-image: url("$(res)/img/element-icons/room/format-bar/code.svg"); + mask-image: url("@vector-im/compound-design-tokens/icons/inline-code.svg"); } .mx_MessageComposerFormatBar_buttonIconInsertLink::after { - mask-image: url("$(res)/img/element-icons/link.svg"); + mask-image: url("@vector-im/compound-design-tokens/icons/link.svg"); mask-size: 18px; } } diff --git a/res/css/views/rooms/_PinnedEventTile.pcss b/res/css/views/rooms/_PinnedEventTile.pcss index e755c3a71d..5b5550dd39 100644 --- a/res/css/views/rooms/_PinnedEventTile.pcss +++ b/res/css/views/rooms/_PinnedEventTile.pcss @@ -77,7 +77,7 @@ limitations under the License. mask-position: center; mask-size: 8px; mask-repeat: no-repeat; - mask-image: url("$(res)/img/image-view/close.svg"); + mask-image: url("@vector-im/compound-design-tokens/icons/close.svg"); } } diff --git a/res/css/views/rooms/_ReplyPreview.pcss b/res/css/views/rooms/_ReplyPreview.pcss index 95a061c404..b11d59a116 100644 --- a/res/css/views/rooms/_ReplyPreview.pcss +++ b/res/css/views/rooms/_ReplyPreview.pcss @@ -39,7 +39,7 @@ limitations under the License. .mx_ReplyPreview_header_cancel { background-color: $primary-content; - mask: url("$(res)/img/cancel.svg"); + mask: url("@vector-im/compound-design-tokens/icons/close.svg"); mask-repeat: no-repeat; mask-position: center; mask-size: 18px; diff --git a/res/css/views/rooms/_RoomInfoLine.pcss b/res/css/views/rooms/_RoomInfoLine.pcss index 237ba389e9..0098df9aa8 100644 --- a/res/css/views/rooms/_RoomInfoLine.pcss +++ b/res/css/views/rooms/_RoomInfoLine.pcss @@ -38,7 +38,7 @@ limitations under the License. &.mx_RoomInfoLine_private::before { width: 10px; mask-size: 10px; - mask-image: url("$(res)/img/element-icons/lock.svg"); + mask-image: url("@vector-im/compound-design-tokens/icons/lock-solid.svg"); } &.mx_RoomInfoLine_video::before { diff --git a/res/css/views/rooms/_RoomList.pcss b/res/css/views/rooms/_RoomList.pcss index 32d03253d4..c39629cff8 100644 --- a/res/css/views/rooms/_RoomList.pcss +++ b/res/css/views/rooms/_RoomList.pcss @@ -37,7 +37,7 @@ limitations under the License. mask-image: url("$(res)/img/element-icons/roomlist/dialpad.svg"); } .mx_RoomList_iconStartChat::before { - mask-image: url("$(res)/img/element-icons/roomlist/member-plus.svg"); + mask-image: url("@vector-im/compound-design-tokens/icons/user-add-solid.svg"); } .mx_RoomList_iconInvite::before { mask-image: url("$(res)/img/element-icons/room/share.svg"); diff --git a/res/css/views/rooms/_RoomListHeader.pcss b/res/css/views/rooms/_RoomListHeader.pcss index 84e391c09c..c2337393f4 100644 --- a/res/css/views/rooms/_RoomListHeader.pcss +++ b/res/css/views/rooms/_RoomListHeader.pcss @@ -50,7 +50,7 @@ limitations under the License. mask-size: contain; mask-repeat: no-repeat; background-color: $tertiary-content; - mask-image: url("$(res)/img/feather-customised/chevron-down.svg"); + mask-image: url("@vector-im/compound-design-tokens/icons/chevron-down.svg"); } &[aria-expanded="true"] { @@ -100,7 +100,7 @@ limitations under the License. mask-image: url("$(res)/img/element-icons/room/invite.svg"); } .mx_RoomListHeader_iconStartChat::before { - mask-image: url("$(res)/img/element-icons/roomlist/member-plus.svg"); + mask-image: url("@vector-im/compound-design-tokens/icons/user-add-solid.svg"); } .mx_RoomListHeader_iconNewRoom::before { mask-image: url("$(res)/img/element-icons/roomlist/hash-plus.svg"); @@ -112,5 +112,5 @@ limitations under the License. mask-image: url("$(res)/img/element-icons/roomlist/hash-search.svg"); } .mx_RoomListHeader_iconPlus::before { - mask-image: url("$(res)/img/element-icons/plus.svg"); + mask-image: url("@vector-im/compound-design-tokens/icons/plus.svg"); } diff --git a/res/css/views/rooms/_RoomPreviewCard.pcss b/res/css/views/rooms/_RoomPreviewCard.pcss index 241b6f37ff..7c63d5c943 100644 --- a/res/css/views/rooms/_RoomPreviewCard.pcss +++ b/res/css/views/rooms/_RoomPreviewCard.pcss @@ -42,7 +42,7 @@ limitations under the License. mask-repeat: no-repeat; mask-position: center; mask-size: contain; - mask-image: url("$(res)/img/element-icons/room/room-summary.svg"); + mask-image: url("@vector-im/compound-design-tokens/icons/info-solid.svg"); background-color: $secondary-content; } } diff --git a/res/css/views/rooms/_RoomSublist.pcss b/res/css/views/rooms/_RoomSublist.pcss index 0e9ad1a9bb..83dafa819b 100644 --- a/res/css/views/rooms/_RoomSublist.pcss +++ b/res/css/views/rooms/_RoomSublist.pcss @@ -139,7 +139,7 @@ limitations under the License. } .mx_RoomSublist_menuButton::before { - mask-image: url("$(res)/img/element-icons/context-menu.svg"); + mask-image: url("@vector-im/compound-design-tokens/icons/overflow-horizontal.svg"); } .mx_RoomSublist_headerText { @@ -168,7 +168,7 @@ limitations under the License. mask-size: contain; mask-repeat: no-repeat; background-color: var(--cpd-color-icon-secondary); - mask-image: url("$(res)/img/feather-customised/chevron-down.svg"); + mask-image: url("@vector-im/compound-design-tokens/icons/chevron-down.svg"); } &.mx_RoomSublist_collapseBtn_collapsed::before { @@ -284,7 +284,7 @@ limitations under the License. .mx_RoomSublist_showMoreButtonChevron, .mx_RoomSublist_showLessButtonChevron { - mask-image: url("$(res)/img/feather-customised/chevron-down.svg"); + mask-image: url("@vector-im/compound-design-tokens/icons/chevron-down.svg"); } .mx_RoomSublist_showLessButtonChevron { diff --git a/res/css/views/rooms/_RoomTile.pcss b/res/css/views/rooms/_RoomTile.pcss index decd1067b1..8bb22d926e 100644 --- a/res/css/views/rooms/_RoomTile.pcss +++ b/res/css/views/rooms/_RoomTile.pcss @@ -141,7 +141,7 @@ limitations under the License. } .mx_RoomTile_menuButton::before { - mask-image: url("$(res)/img/element-icons/context-menu.svg"); + mask-image: url("@vector-im/compound-design-tokens/icons/overflow-horizontal.svg"); } &:not(.mx_RoomTile_minimized, .mx_RoomTile_sticky) { @@ -190,7 +190,7 @@ limitations under the License. .mx_RoomTile_contextMenu { .mx_RoomTile_iconStar::before { - mask-image: url("$(res)/img/element-icons/roomlist/favorite.svg"); + mask-image: url("@vector-im/compound-design-tokens/icons/favourite-solid.svg"); } .mx_RoomTile_iconArrowDown::before { @@ -214,7 +214,7 @@ limitations under the License. } .mx_RoomTile_iconPeople::before { - mask-image: url("$(res)/img/element-icons/room/members.svg"); + mask-image: url("@vector-im/compound-design-tokens/icons/user-profile-solid.svg"); } .mx_RoomTile_iconFiles::before { @@ -226,19 +226,19 @@ limitations under the License. } .mx_RoomTile_iconWidgets::before { - mask-image: url("$(res)/img/element-icons/room/apps.svg"); + mask-image: url("@vector-im/compound-design-tokens/icons/extensions-solid.svg.svg"); } .mx_RoomTile_iconSettings::before { - mask-image: url("$(res)/img/element-icons/settings.svg"); + mask-image: url("@vector-im/compound-design-tokens/icons/settings-solid.svg"); } .mx_RoomTile_iconExport::before { - mask-image: url("$(res)/img/element-icons/export.svg"); + mask-image: url("@vector-im/compound-design-tokens/icons/export-archive.svg"); } .mx_RoomTile_iconCopyLink::before { - mask-image: url("$(res)/img/element-icons/link.svg"); + mask-image: url("@vector-im/compound-design-tokens/icons/link.svg"); } .mx_RoomTile_iconInvite::before { @@ -246,6 +246,6 @@ limitations under the License. } .mx_RoomTile_iconSignOut::before { - mask-image: url("$(res)/img/element-icons/leave.svg"); + mask-image: url("@vector-im/compound-design-tokens/icons/leave.svg"); } } diff --git a/res/css/views/rooms/_TopUnreadMessagesBar.pcss b/res/css/views/rooms/_TopUnreadMessagesBar.pcss index 6c25ff8e74..d433a48b8f 100644 --- a/res/css/views/rooms/_TopUnreadMessagesBar.pcss +++ b/res/css/views/rooms/_TopUnreadMessagesBar.pcss @@ -49,7 +49,7 @@ limitations under the License. position: absolute; width: 36px; height: 36px; - mask-image: url("$(res)/img/element-icons/message/chevron-up.svg"); + mask-image: url("@vector-im/compound-design-tokens/icons/chevron-up.svg"); mask-repeat: no-repeat; mask-size: 20px; mask-position: center; @@ -71,7 +71,7 @@ limitations under the License. position: absolute; width: 18px; height: 18px; - mask-image: url("$(res)/img/cancel.svg"); + mask-image: url("@vector-im/compound-design-tokens/icons/close.svg"); mask-repeat: no-repeat; mask-size: 10px; mask-position: 4px 4px; diff --git a/res/css/views/rooms/_VoiceRecordComposerTile.pcss b/res/css/views/rooms/_VoiceRecordComposerTile.pcss index 936aee0f33..212180dd6f 100644 --- a/res/css/views/rooms/_VoiceRecordComposerTile.pcss +++ b/res/css/views/rooms/_VoiceRecordComposerTile.pcss @@ -43,7 +43,7 @@ limitations under the License. background-color: $voice-record-icon-color; mask-repeat: no-repeat; mask-size: contain; - mask-image: url("$(res)/img/element-icons/trashcan.svg"); + mask-image: url("@vector-im/compound-design-tokens/icons/delete.svg"); } .mx_VoiceRecordComposerTile_uploadingState { diff --git a/res/css/views/settings/tabs/user/_SecurityUserSettingsTab.pcss b/res/css/views/settings/tabs/user/_SecurityUserSettingsTab.pcss index ad5b3f8a11..0576bbc365 100644 --- a/res/css/views/settings/tabs/user/_SecurityUserSettingsTab.pcss +++ b/res/css/views/settings/tabs/user/_SecurityUserSettingsTab.pcss @@ -44,6 +44,6 @@ limitations under the License. top: 0; left: 0; background-color: $alert; - mask-image: url("$(res)/img/feather-customised/alert-triangle.svg"); + mask-image: url("@vector-im/compound-design-tokens/icons/warning.svg"); } } diff --git a/res/css/views/spaces/_SpaceCreateMenu.pcss b/res/css/views/spaces/_SpaceCreateMenu.pcss index b10fc3f230..b9ff360af7 100644 --- a/res/css/views/spaces/_SpaceCreateMenu.pcss +++ b/res/css/views/spaces/_SpaceCreateMenu.pcss @@ -51,7 +51,7 @@ limitations under the License. } .mx_SpaceCreateMenuType_private::before { - mask-image: url("$(res)/img/element-icons/lock.svg"); + mask-image: url("@vector-im/compound-design-tokens/icons/lock-solid.svg"); mask-size: 18px; } @@ -75,7 +75,7 @@ limitations under the License. mask-repeat: no-repeat; mask-position: 2px 3px; mask-size: 24px; - mask-image: url("$(res)/img/feather-customised/chevron-down.svg"); + mask-image: url("@vector-im/compound-design-tokens/icons/chevron-down.svg"); } } diff --git a/res/css/views/spaces/_SpacePublicShare.pcss b/res/css/views/spaces/_SpacePublicShare.pcss index f993d22361..11426ba23c 100644 --- a/res/css/views/spaces/_SpacePublicShare.pcss +++ b/res/css/views/spaces/_SpacePublicShare.pcss @@ -19,7 +19,7 @@ limitations under the License. @mixin SpacePillButton; &.mx_SpacePublicShare_shareButton::before { - mask-image: url("$(res)/img/element-icons/link.svg"); + mask-image: url("@vector-im/compound-design-tokens/icons/link.svg"); } &.mx_SpacePublicShare_inviteButton::before { diff --git a/res/css/views/toasts/_IncomingCallToast.pcss b/res/css/views/toasts/_IncomingCallToast.pcss index 8bc86db134..a3e98895fe 100644 --- a/res/css/views/toasts/_IncomingCallToast.pcss +++ b/res/css/views/toasts/_IncomingCallToast.pcss @@ -97,7 +97,7 @@ limitations under the License. &::before { content: ""; - mask-image: url("$(res)/img/cancel.svg"); + mask-image: url("@vector-im/compound-design-tokens/icons/close.svg"); height: inherit; width: inherit; diff --git a/res/css/views/user-onboarding/_UserOnboardingButton.pcss b/res/css/views/user-onboarding/_UserOnboardingButton.pcss index 0f031af33a..a64a7247ec 100644 --- a/res/css/views/user-onboarding/_UserOnboardingButton.pcss +++ b/res/css/views/user-onboarding/_UserOnboardingButton.pcss @@ -67,7 +67,7 @@ limitations under the License. left: 50%; top: 50%; transform: translate(-50%, -50%); - mask-image: url("$(res)/img/element-icons/cancel-rounded.svg"); + mask-image: url("@vector-im/compound-design-tokens/icons/close.svg"); } } } diff --git a/res/css/views/user-onboarding/_UserOnboardingTask.pcss b/res/css/views/user-onboarding/_UserOnboardingTask.pcss index 05232da8c5..32f280c1c2 100644 --- a/res/css/views/user-onboarding/_UserOnboardingTask.pcss +++ b/res/css/views/user-onboarding/_UserOnboardingTask.pcss @@ -85,7 +85,7 @@ limitations under the License. position: absolute; left: calc(50% - 8px); top: calc(50% - 8px); - mask-image: url("$(res)/img/element-icons/check-white.svg"); + mask-image: url("@vector-im/compound-design-tokens/icons/check.svg"); animation-duration: 300ms; animation-fill-mode: both; diff --git a/res/css/views/voip/LegacyCallView/_LegacyCallViewButtons.pcss b/res/css/views/voip/LegacyCallView/_LegacyCallViewButtons.pcss index 8e24318ef9..0c21f85617 100644 --- a/res/css/views/voip/LegacyCallView/_LegacyCallViewButtons.pcss +++ b/res/css/views/voip/LegacyCallView/_LegacyCallViewButtons.pcss @@ -77,7 +77,7 @@ limitations under the License. &::before { width: 14px; height: 14px; - mask-image: url("$(res)/img/element-icons/message/chevron-up.svg"); + mask-image: url("@vector-im/compound-design-tokens/icons/chevron-up.svg"); } &.mx_LegacyCallViewButtons_dropdownButton_collapsed::before { @@ -95,19 +95,19 @@ limitations under the License. &.mx_LegacyCallViewButtons_button_mic::before { height: 20px; - mask-image: url("$(res)/img/element-icons/mic.svg"); + mask-image: url("@vector-im/compound-design-tokens/icons/mic-on-solid.svg"); width: 20px; } &.mx_LegacyCallViewButtons_button_vid::before { - mask-image: url("$(res)/img/voip/call-view/cam-on.svg"); + mask-image: url("@vector-im/compound-design-tokens/icons/video-call-solid.svg"); } &.mx_LegacyCallViewButtons_button_screensharing { background-color: $accent; &::before { - mask-image: url("$(res)/img/voip/call-view/screensharing.svg"); + mask-image: url("@vector-im/compound-design-tokens/icons/share-screen-solid.svg"); background-color: white; /* Same on both themes */ } } @@ -126,19 +126,19 @@ limitations under the License. &.mx_LegacyCallViewButtons_button_mic::before { height: 20px; - mask-image: url("$(res)/img/element-icons/Mic-off.svg"); + mask-image: url("@vector-im/compound-design-tokens/icons/mic-off-solid.svg"); width: 20px; } &.mx_LegacyCallViewButtons_button_vid::before { - mask-image: url("$(res)/img/voip/call-view/cam-off.svg"); + mask-image: url("@vector-im/compound-design-tokens/icons/video-call-off-solid.svg"); } &.mx_LegacyCallViewButtons_button_screensharing { background-color: $call-view-button-on-background; &::before { - mask-image: url("$(res)/img/voip/call-view/screensharing.svg"); + mask-image: url("@vector-im/compound-design-tokens/icons/share-screen-solid.svg"); background-color: $call-view-button-on-foreground; } } @@ -169,7 +169,7 @@ limitations under the License. } &.mx_LegacyCallViewButtons_button_more::before { - mask-image: url("$(res)/img/voip/call-view/more.svg"); + mask-image: url("@vector-im/compound-design-tokens/icons/overflow-horizontal.svg"); } /* Stateless buttons */ diff --git a/res/css/views/voip/_CallView.pcss b/res/css/views/voip/_CallView.pcss index 44cbbfd0b1..54dc897046 100644 --- a/res/css/views/voip/_CallView.pcss +++ b/res/css/views/voip/_CallView.pcss @@ -131,12 +131,12 @@ limitations under the License. } &.mx_CallView_deviceButton_audio::before { - mask-image: url("$(res)/img/element-icons/mic.svg"); + mask-image: url("@vector-im/compound-design-tokens/icons/mic-on-solid.svg"); mask-size: 14px; } &.mx_CallView_deviceButton_video::before { - mask-image: url("$(res)/img/voip/call-view/cam-on.svg"); + mask-image: url("@vector-im/compound-design-tokens/icons/video-call-solid.svg"); } } @@ -155,7 +155,7 @@ limitations under the License. &::before { content: ""; display: inline-block; - mask-image: url("$(res)/img/feather-customised/chevron-down.svg"); + mask-image: url("@vector-im/compound-design-tokens/icons/chevron-down.svg"); mask-size: 20px; mask-position: center; background-color: $call-primary-content; @@ -176,12 +176,12 @@ limitations under the License. .mx_CallView_deviceButton { &.mx_CallView_deviceButton_audio::before { - mask-image: url("$(res)/img/element-icons/Mic-off.svg"); + mask-image: url("@vector-im/compound-design-tokens/icons/mic-off-solid.svg"); mask-size: 18px; } &.mx_CallView_deviceButton_video::before { - mask-image: url("$(res)/img/voip/call-view/cam-off.svg"); + mask-image: url("@vector-im/compound-design-tokens/icons/video-call-off-solid.svg"); } } } diff --git a/res/css/views/voip/_VideoFeed.pcss b/res/css/views/voip/_VideoFeed.pcss index 53d00c12f8..d56d952f0c 100644 --- a/res/css/views/voip/_VideoFeed.pcss +++ b/res/css/views/voip/_VideoFeed.pcss @@ -80,11 +80,11 @@ limitations under the License. } &.mx_VideoFeed_mic_muted::before { - mask-image: url("$(res)/img/element-icons/Mic-off.svg"); + mask-image: url("@vector-im/compound-design-tokens/icons/mic-off-solid.svg"); } &.mx_VideoFeed_mic_unmuted::before { - mask-image: url("$(res)/img/element-icons/mic.svg"); + mask-image: url("@vector-im/compound-design-tokens/icons/mic-on-solid.svg"); } } } diff --git a/res/img/cancel-small.svg b/res/img/cancel-small.svg deleted file mode 100644 index e4c8cafc10..0000000000 --- a/res/img/cancel-small.svg +++ /dev/null @@ -1,13 +0,0 @@ - - - - Line + Line - Created with Sketch. - - - - - - - - \ No newline at end of file diff --git a/res/img/cancel.svg b/res/img/cancel.svg deleted file mode 100644 index 2b7083e875..0000000000 --- a/res/img/cancel.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/res/img/compound/checkbox-32px.svg b/res/img/compound/checkbox-32px.svg deleted file mode 100644 index f1ee8b7dc2..0000000000 --- a/res/img/compound/checkbox-32px.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/res/img/compound/close-16px.svg b/res/img/compound/close-16px.svg deleted file mode 100644 index 6929ae3f90..0000000000 --- a/res/img/compound/close-16px.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/res/img/compound/close-8px.svg b/res/img/compound/close-8px.svg deleted file mode 100644 index a7d7977149..0000000000 --- a/res/img/compound/close-8px.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/res/img/compound/error-16px.svg b/res/img/compound/error-16px.svg deleted file mode 100644 index e2e68f431c..0000000000 --- a/res/img/compound/error-16px.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/res/img/compound/mic-16px.svg b/res/img/compound/mic-16px.svg deleted file mode 100644 index bc80ff14ce..0000000000 --- a/res/img/compound/mic-16px.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/res/img/compound/pause-12.svg b/res/img/compound/pause-12.svg deleted file mode 100644 index 8e2cc88a5b..0000000000 --- a/res/img/compound/pause-12.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/res/img/compound/play-16.svg b/res/img/compound/play-16.svg deleted file mode 100644 index c8ed756429..0000000000 --- a/res/img/compound/play-16.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/res/img/compound/thread-16px.svg b/res/img/compound/thread-16px.svg deleted file mode 100644 index f1a678ebc9..0000000000 --- a/res/img/compound/thread-16px.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/res/img/compound/user.svg b/res/img/compound/user.svg deleted file mode 100644 index fa8bb87cd1..0000000000 --- a/res/img/compound/user.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/res/img/e2e/disabled.svg b/res/img/e2e/disabled.svg deleted file mode 100644 index 2f6110a36a..0000000000 --- a/res/img/e2e/disabled.svg +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/res/img/element-icons/Email-icon.svg b/res/img/element-icons/Email-icon.svg deleted file mode 100644 index c92b153cf0..0000000000 --- a/res/img/element-icons/Email-icon.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/res/img/element-icons/Mic-off.svg b/res/img/element-icons/Mic-off.svg deleted file mode 100644 index 0bf1c3f922..0000000000 --- a/res/img/element-icons/Mic-off.svg +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/res/img/element-icons/Record.svg b/res/img/element-icons/Record.svg deleted file mode 100644 index a16ce774b0..0000000000 --- a/res/img/element-icons/Record.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/res/img/element-icons/Stop.svg b/res/img/element-icons/Stop.svg deleted file mode 100644 index d63459e1db..0000000000 --- a/res/img/element-icons/Stop.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/res/img/element-icons/back.svg b/res/img/element-icons/back.svg deleted file mode 100644 index 62aef5df27..0000000000 --- a/res/img/element-icons/back.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/res/img/element-icons/brands/element.svg b/res/img/element-icons/brands/element.svg deleted file mode 100644 index 6861de0955..0000000000 --- a/res/img/element-icons/brands/element.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/res/img/element-icons/cancel-rounded.svg b/res/img/element-icons/cancel-rounded.svg deleted file mode 100644 index 7439aaeaba..0000000000 --- a/res/img/element-icons/cancel-rounded.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/res/img/element-icons/caret-left.svg b/res/img/element-icons/caret-left.svg deleted file mode 100644 index 14c28dc3b1..0000000000 --- a/res/img/element-icons/caret-left.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/res/img/element-icons/check-white.svg b/res/img/element-icons/check-white.svg deleted file mode 100644 index 018c8b33d9..0000000000 --- a/res/img/element-icons/check-white.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/res/img/element-icons/check.svg b/res/img/element-icons/check.svg deleted file mode 100644 index afbd40cf10..0000000000 --- a/res/img/element-icons/check.svg +++ /dev/null @@ -1,20 +0,0 @@ - - - - - diff --git a/res/img/element-icons/context-menu.svg b/res/img/element-icons/context-menu.svg deleted file mode 100644 index 1cededd2ad..0000000000 --- a/res/img/element-icons/context-menu.svg +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/res/img/element-icons/copy.svg b/res/img/element-icons/copy.svg deleted file mode 100644 index 5563442a30..0000000000 --- a/res/img/element-icons/copy.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/res/img/element-icons/devices.svg b/res/img/element-icons/devices.svg deleted file mode 100644 index 6c26cfe97e..0000000000 --- a/res/img/element-icons/devices.svg +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/res/img/element-icons/export.svg b/res/img/element-icons/export.svg deleted file mode 100644 index 038866c294..0000000000 --- a/res/img/element-icons/export.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/res/img/element-icons/home.svg b/res/img/element-icons/home.svg deleted file mode 100644 index ae5aceaec2..0000000000 --- a/res/img/element-icons/home.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/res/img/element-icons/info.svg b/res/img/element-icons/info.svg deleted file mode 100644 index b5769074ab..0000000000 --- a/res/img/element-icons/info.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/res/img/element-icons/leave.svg b/res/img/element-icons/leave.svg deleted file mode 100644 index 773e27d4ce..0000000000 --- a/res/img/element-icons/leave.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/res/img/element-icons/link.svg b/res/img/element-icons/link.svg deleted file mode 100644 index 07dbdc0ccc..0000000000 --- a/res/img/element-icons/link.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/res/img/element-icons/location.svg b/res/img/element-icons/location.svg deleted file mode 100644 index fc8337a43b..0000000000 --- a/res/img/element-icons/location.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/res/img/element-icons/lock.svg b/res/img/element-icons/lock.svg deleted file mode 100644 index 5ad69d9f1a..0000000000 --- a/res/img/element-icons/lock.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/res/img/element-icons/maximise-expand.svg b/res/img/element-icons/maximise-expand.svg deleted file mode 100644 index a63f7e0022..0000000000 --- a/res/img/element-icons/maximise-expand.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/res/img/element-icons/message/chevron-up.svg b/res/img/element-icons/message/chevron-up.svg deleted file mode 100644 index 4eb5ecc33e..0000000000 --- a/res/img/element-icons/message/chevron-up.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/res/img/element-icons/message/fwd.svg b/res/img/element-icons/message/fwd.svg deleted file mode 100644 index 8bcc70d092..0000000000 --- a/res/img/element-icons/message/fwd.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/res/img/element-icons/message/overflow-large.svg b/res/img/element-icons/message/overflow-large.svg deleted file mode 100644 index 65a52e4aa2..0000000000 --- a/res/img/element-icons/message/overflow-large.svg +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/res/img/element-icons/message/thread.svg b/res/img/element-icons/message/thread.svg deleted file mode 100644 index dc23d8c14a..0000000000 --- a/res/img/element-icons/message/thread.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/res/img/element-icons/mic.svg b/res/img/element-icons/mic.svg deleted file mode 100644 index 00f0564edc..0000000000 --- a/res/img/element-icons/mic.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/res/img/element-icons/minimise-collapse.svg b/res/img/element-icons/minimise-collapse.svg deleted file mode 100644 index 535c56a36b..0000000000 --- a/res/img/element-icons/minimise-collapse.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/res/img/element-icons/pause.svg b/res/img/element-icons/pause.svg deleted file mode 100644 index 4b7be99e3b..0000000000 --- a/res/img/element-icons/pause.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/res/img/element-icons/play.svg b/res/img/element-icons/play.svg deleted file mode 100644 index 3443ae01fa..0000000000 --- a/res/img/element-icons/play.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/res/img/element-icons/plus.svg b/res/img/element-icons/plus.svg deleted file mode 100644 index ea1972237d..0000000000 --- a/res/img/element-icons/plus.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/res/img/element-icons/qrcode.svg b/res/img/element-icons/qrcode.svg deleted file mode 100644 index 7787141ad5..0000000000 --- a/res/img/element-icons/qrcode.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/res/img/element-icons/retry.svg b/res/img/element-icons/retry.svg deleted file mode 100644 index 6e5b8651fc..0000000000 --- a/res/img/element-icons/retry.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - diff --git a/res/img/element-icons/room/apps.svg b/res/img/element-icons/room/apps.svg deleted file mode 100644 index c90704752c..0000000000 --- a/res/img/element-icons/room/apps.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/res/img/element-icons/room/composer/bold.svg b/res/img/element-icons/room/composer/bold.svg deleted file mode 100644 index 043f9c064c..0000000000 --- a/res/img/element-icons/room/composer/bold.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/res/img/element-icons/room/composer/bulleted_list.svg b/res/img/element-icons/room/composer/bulleted_list.svg deleted file mode 100644 index df07604567..0000000000 --- a/res/img/element-icons/room/composer/bulleted_list.svg +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - diff --git a/res/img/element-icons/room/composer/code_block.svg b/res/img/element-icons/room/composer/code_block.svg deleted file mode 100644 index e2949ec8c7..0000000000 --- a/res/img/element-icons/room/composer/code_block.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/res/img/element-icons/room/composer/indent_decrease.svg b/res/img/element-icons/room/composer/indent_decrease.svg deleted file mode 100644 index 660c3e55ca..0000000000 --- a/res/img/element-icons/room/composer/indent_decrease.svg +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - diff --git a/res/img/element-icons/room/composer/indent_increase.svg b/res/img/element-icons/room/composer/indent_increase.svg deleted file mode 100644 index f40162e05d..0000000000 --- a/res/img/element-icons/room/composer/indent_increase.svg +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - diff --git a/res/img/element-icons/room/composer/inline_code.svg b/res/img/element-icons/room/composer/inline_code.svg deleted file mode 100644 index d9f75fde0c..0000000000 --- a/res/img/element-icons/room/composer/inline_code.svg +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/res/img/element-icons/room/composer/italic.svg b/res/img/element-icons/room/composer/italic.svg deleted file mode 100644 index c6cd755d94..0000000000 --- a/res/img/element-icons/room/composer/italic.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/res/img/element-icons/room/composer/link.svg b/res/img/element-icons/room/composer/link.svg deleted file mode 100644 index 8c7429e16a..0000000000 --- a/res/img/element-icons/room/composer/link.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/res/img/element-icons/room/composer/location.svg b/res/img/element-icons/room/composer/location.svg deleted file mode 100644 index 7118645443..0000000000 --- a/res/img/element-icons/room/composer/location.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/res/img/element-icons/room/composer/numbered_list.svg b/res/img/element-icons/room/composer/numbered_list.svg deleted file mode 100644 index 5748c97766..0000000000 --- a/res/img/element-icons/room/composer/numbered_list.svg +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - diff --git a/res/img/element-icons/room/composer/quote.svg b/res/img/element-icons/room/composer/quote.svg deleted file mode 100644 index e83480a6ee..0000000000 --- a/res/img/element-icons/room/composer/quote.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/res/img/element-icons/room/composer/rich_text.svg b/res/img/element-icons/room/composer/rich_text.svg deleted file mode 100644 index d2da9d2551..0000000000 --- a/res/img/element-icons/room/composer/rich_text.svg +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - diff --git a/res/img/element-icons/room/composer/strikethrough.svg b/res/img/element-icons/room/composer/strikethrough.svg deleted file mode 100644 index 9a9761729b..0000000000 --- a/res/img/element-icons/room/composer/strikethrough.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/res/img/element-icons/room/composer/underline.svg b/res/img/element-icons/room/composer/underline.svg deleted file mode 100644 index f253c874ea..0000000000 --- a/res/img/element-icons/room/composer/underline.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/res/img/element-icons/room/ellipsis.svg b/res/img/element-icons/room/ellipsis.svg deleted file mode 100644 index e7fcca8f94..0000000000 --- a/res/img/element-icons/room/ellipsis.svg +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/res/img/element-icons/room/format-bar/bold.svg b/res/img/element-icons/room/format-bar/bold.svg deleted file mode 100644 index e21210c525..0000000000 --- a/res/img/element-icons/room/format-bar/bold.svg +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/res/img/element-icons/room/format-bar/code.svg b/res/img/element-icons/room/format-bar/code.svg deleted file mode 100644 index 38f94457e8..0000000000 --- a/res/img/element-icons/room/format-bar/code.svg +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/res/img/element-icons/room/format-bar/italic.svg b/res/img/element-icons/room/format-bar/italic.svg deleted file mode 100644 index 270c4f5f15..0000000000 --- a/res/img/element-icons/room/format-bar/italic.svg +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/res/img/element-icons/room/format-bar/quote.svg b/res/img/element-icons/room/format-bar/quote.svg deleted file mode 100644 index 3d3d444487..0000000000 --- a/res/img/element-icons/room/format-bar/quote.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/res/img/element-icons/room/format-bar/strikethrough.svg b/res/img/element-icons/room/format-bar/strikethrough.svg deleted file mode 100644 index 775e0cf8ec..0000000000 --- a/res/img/element-icons/room/format-bar/strikethrough.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/res/img/element-icons/room/members.svg b/res/img/element-icons/room/members.svg deleted file mode 100644 index 50aa0aa466..0000000000 --- a/res/img/element-icons/room/members.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/res/img/element-icons/room/message-bar/reply.svg b/res/img/element-icons/room/message-bar/reply.svg deleted file mode 100644 index c32848a0b0..0000000000 --- a/res/img/element-icons/room/message-bar/reply.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/res/img/element-icons/room/room-summary.svg b/res/img/element-icons/room/room-summary.svg deleted file mode 100644 index b6ac258b18..0000000000 --- a/res/img/element-icons/room/room-summary.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/res/img/element-icons/room/thread.svg b/res/img/element-icons/room/thread.svg deleted file mode 100644 index d1b8b35c91..0000000000 --- a/res/img/element-icons/room/thread.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/res/img/element-icons/roomlist/checkmark.svg b/res/img/element-icons/roomlist/checkmark.svg deleted file mode 100644 index ab6ced94a3..0000000000 --- a/res/img/element-icons/roomlist/checkmark.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/res/img/element-icons/roomlist/favorite.svg b/res/img/element-icons/roomlist/favorite.svg deleted file mode 100644 index c601b69808..0000000000 --- a/res/img/element-icons/roomlist/favorite.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/res/img/element-icons/roomlist/member-plus.svg b/res/img/element-icons/roomlist/member-plus.svg deleted file mode 100644 index 71269b54ca..0000000000 --- a/res/img/element-icons/roomlist/member-plus.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/res/img/element-icons/roomlist/search.svg b/res/img/element-icons/roomlist/search.svg deleted file mode 100644 index b6a1ad100f..0000000000 --- a/res/img/element-icons/roomlist/search.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/res/img/element-icons/security.svg b/res/img/element-icons/security.svg deleted file mode 100644 index 3fe62b7af9..0000000000 --- a/res/img/element-icons/security.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/res/img/element-icons/send-message.svg b/res/img/element-icons/send-message.svg deleted file mode 100644 index ce35bf8bc8..0000000000 --- a/res/img/element-icons/send-message.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/res/img/element-icons/settings.svg b/res/img/element-icons/settings.svg deleted file mode 100644 index 05d640df27..0000000000 --- a/res/img/element-icons/settings.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/res/img/element-icons/thread-summary.svg b/res/img/element-icons/thread-summary.svg deleted file mode 100644 index 2c4f0ead0c..0000000000 --- a/res/img/element-icons/thread-summary.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/res/img/element-icons/trashcan.svg b/res/img/element-icons/trashcan.svg deleted file mode 100644 index 4d0c4a6065..0000000000 --- a/res/img/element-icons/trashcan.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/res/img/element-icons/x-8px.svg b/res/img/element-icons/x-8px.svg deleted file mode 100644 index c9730ed619..0000000000 --- a/res/img/element-icons/x-8px.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/res/img/ellipsis.svg b/res/img/ellipsis.svg deleted file mode 100644 index d60c844089..0000000000 --- a/res/img/ellipsis.svg +++ /dev/null @@ -1,25 +0,0 @@ - - - - icons_archive - Created with Sketch. - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/res/img/feather-customised/alert-triangle.svg b/res/img/feather-customised/alert-triangle.svg deleted file mode 100644 index ceb664790f..0000000000 --- a/res/img/feather-customised/alert-triangle.svg +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/res/img/feather-customised/check.svg b/res/img/feather-customised/check.svg deleted file mode 100644 index 85cd196511..0000000000 --- a/res/img/feather-customised/check.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/res/img/feather-customised/chevron-down.svg b/res/img/feather-customised/chevron-down.svg deleted file mode 100644 index a091913b42..0000000000 --- a/res/img/feather-customised/chevron-down.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/res/img/feather-customised/dropdown-arrow.svg b/res/img/feather-customised/dropdown-arrow.svg deleted file mode 100644 index 24645d2bba..0000000000 --- a/res/img/feather-customised/dropdown-arrow.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/res/img/feather-customised/files.svg b/res/img/feather-customised/files.svg deleted file mode 100644 index e3bfe30ab0..0000000000 --- a/res/img/feather-customised/files.svg +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - diff --git a/res/img/feather-customised/help-circle.svg b/res/img/feather-customised/help-circle.svg deleted file mode 100644 index 61b853aae8..0000000000 --- a/res/img/feather-customised/help-circle.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/res/img/feather-customised/image.svg b/res/img/feather-customised/image.svg deleted file mode 100644 index 9690aecf36..0000000000 --- a/res/img/feather-customised/image.svg +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/res/img/feather-customised/plus.svg b/res/img/feather-customised/plus.svg deleted file mode 100644 index c747253139..0000000000 --- a/res/img/feather-customised/plus.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/res/img/feather-customised/search-input.svg b/res/img/feather-customised/search-input.svg deleted file mode 100644 index 028b84d559..0000000000 --- a/res/img/feather-customised/search-input.svg +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - diff --git a/res/img/feather-customised/trash.custom.svg b/res/img/feather-customised/trash.custom.svg deleted file mode 100644 index dc1985ddb2..0000000000 --- a/res/img/feather-customised/trash.custom.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/res/img/feather-customised/warning-triangle.svg b/res/img/feather-customised/warning-triangle.svg deleted file mode 100644 index 4d7bfe0798..0000000000 --- a/res/img/feather-customised/warning-triangle.svg +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - diff --git a/res/img/feather-customised/x.svg b/res/img/feather-customised/x.svg deleted file mode 100644 index a4f6c4a81a..0000000000 --- a/res/img/feather-customised/x.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/res/img/format/bold.svg b/res/img/format/bold.svg deleted file mode 100644 index 634d735031..0000000000 --- a/res/img/format/bold.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/res/img/format/code.svg b/res/img/format/code.svg deleted file mode 100644 index 0a29bcd7bd..0000000000 --- a/res/img/format/code.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/res/img/format/italics.svg b/res/img/format/italics.svg deleted file mode 100644 index 841afadffd..0000000000 --- a/res/img/format/italics.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/res/img/format/quote.svg b/res/img/format/quote.svg deleted file mode 100644 index 82d3403314..0000000000 --- a/res/img/format/quote.svg +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/res/img/format/strikethrough.svg b/res/img/format/strikethrough.svg deleted file mode 100644 index fc02b0aae2..0000000000 --- a/res/img/format/strikethrough.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/res/img/icon-address-delete.svg b/res/img/icon-address-delete.svg deleted file mode 100644 index 1289d5aafc..0000000000 --- a/res/img/icon-address-delete.svg +++ /dev/null @@ -1,15 +0,0 @@ - - - - 943783E9-DBD7-4D4E-BAC9-35437C17C2C4 - Created with sketchtool. - - - - - - - - - - diff --git a/res/img/icon-email-user.svg b/res/img/icon-email-user.svg deleted file mode 100644 index 2d41e06f98..0000000000 --- a/res/img/icon-email-user.svg +++ /dev/null @@ -1,17 +0,0 @@ - - - - 6F488856-F8EF-479C-9747-AB6E0945C7DE - Created with sketchtool. - - - - - - - - - - - - diff --git a/res/img/icon-invite-people.svg b/res/img/icon-invite-people.svg deleted file mode 100644 index 73500ebe06..0000000000 --- a/res/img/icon-invite-people.svg +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/res/img/icon-return.svg b/res/img/icon-return.svg deleted file mode 100644 index 80da0f82aa..0000000000 --- a/res/img/icon-return.svg +++ /dev/null @@ -1,18 +0,0 @@ - - - - B542A09B-DBBF-41D4-A5FD-D05EE1E6BBC4 - Created with sketchtool. - - - - - - - - - - - - - \ No newline at end of file diff --git a/res/img/icon_context_delete.svg b/res/img/icon_context_delete.svg deleted file mode 100644 index 896b94ad13..0000000000 --- a/res/img/icon_context_delete.svg +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - diff --git a/res/img/icons-close.svg b/res/img/icons-close.svg deleted file mode 100644 index b2dd44fc26..0000000000 --- a/res/img/icons-close.svg +++ /dev/null @@ -1,96 +0,0 @@ - - - -image/svg+xmlicons_create_room - -icons_create_room -Created with sketchtool. - - - - - - - - - - - - - - diff --git a/res/img/icons-create-room.svg b/res/img/icons-create-room.svg deleted file mode 100644 index 78c45563d1..0000000000 --- a/res/img/icons-create-room.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/res/img/icons-room-add.svg b/res/img/icons-room-add.svg deleted file mode 100644 index f0b7584df9..0000000000 --- a/res/img/icons-room-add.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/res/img/image-view/close.svg b/res/img/image-view/close.svg deleted file mode 100644 index d603b7f5cc..0000000000 --- a/res/img/image-view/close.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/res/img/image-view/more.svg b/res/img/image-view/more.svg deleted file mode 100644 index 4f5fa6f9b9..0000000000 --- a/res/img/image-view/more.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/res/img/plus.svg b/res/img/plus.svg deleted file mode 100644 index e1d59ec6f4..0000000000 --- a/res/img/plus.svg +++ /dev/null @@ -1,13 +0,0 @@ - - - - Line + Line - Created with Sketch. - - - - - - - - diff --git a/res/img/tick-circle.svg b/res/img/tick-circle.svg deleted file mode 100644 index 7cedb62985..0000000000 --- a/res/img/tick-circle.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/res/img/voip/call-view/cam-off.svg b/res/img/voip/call-view/cam-off.svg deleted file mode 100644 index 9a36290521..0000000000 --- a/res/img/voip/call-view/cam-off.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/res/img/voip/call-view/cam-on.svg b/res/img/voip/call-view/cam-on.svg deleted file mode 100644 index fb18058786..0000000000 --- a/res/img/voip/call-view/cam-on.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/res/img/voip/call-view/more.svg b/res/img/voip/call-view/more.svg deleted file mode 100644 index af15cf1630..0000000000 --- a/res/img/voip/call-view/more.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/res/img/voip/call-view/screensharing.svg b/res/img/voip/call-view/screensharing.svg deleted file mode 100644 index 4639c34cbf..0000000000 --- a/res/img/voip/call-view/screensharing.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/res/img/voip/declined-video.svg b/res/img/voip/declined-video.svg deleted file mode 100644 index 509ffa8fd1..0000000000 --- a/res/img/voip/declined-video.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/res/img/voip/missed-video.svg b/res/img/voip/missed-video.svg deleted file mode 100644 index a2f3bc73ac..0000000000 --- a/res/img/voip/missed-video.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/res/themes/legacy-light/css/_legacy-light.pcss b/res/themes/legacy-light/css/_legacy-light.pcss index e40fbde72b..398cf0e1f1 100644 --- a/res/themes/legacy-light/css/_legacy-light.pcss +++ b/res/themes/legacy-light/css/_legacy-light.pcss @@ -239,7 +239,7 @@ $event-highlight-bg-color: $yellow-background; /* event timestamp */ $event-timestamp-color: #acacac; -$copy-button-url: "$(res)/img/element-icons/copy.svg"; +$copy-button-url: "@vector-im/compound-design-tokens/icons/copy.svg"; /* e2e */ $e2e-verified-color: #0dbd8b; diff --git a/res/themes/light/css/_light.pcss b/res/themes/light/css/_light.pcss index 1a237427f2..eea391bdfe 100644 --- a/res/themes/light/css/_light.pcss +++ b/res/themes/light/css/_light.pcss @@ -345,7 +345,7 @@ $focus-brightness: 105%; /* Icon URLs */ /* ******************** */ -$copy-button-url: "$(res)/img/element-icons/copy.svg"; +$copy-button-url: "@vector-im/compound-design-tokens/icons/copy.svg"; /* ******************** */ /* Location sharing */ diff --git a/src/async-components/views/dialogs/security/CreateSecretStorageDialog.tsx b/src/async-components/views/dialogs/security/CreateSecretStorageDialog.tsx index 97469177d9..4b8d53d2b3 100644 --- a/src/async-components/views/dialogs/security/CreateSecretStorageDialog.tsx +++ b/src/async-components/views/dialogs/security/CreateSecretStorageDialog.tsx @@ -22,6 +22,7 @@ import { AuthDict, CrossSigningKeys, MatrixError, UIAFlow, UIAResponse } from "m import { CryptoEvent } from "matrix-js-sdk/src/crypto"; import classNames from "classnames"; import { BackupTrustInfo, GeneratedSecretStorageKey, KeyBackupInfo } from "matrix-js-sdk/src/crypto-api"; +import { Icon as CheckmarkIcon } from "@vector-im/compound-design-tokens/icons/check.svg"; import { MatrixClientPeg } from "../../../../MatrixClientPeg"; import { _t, _td } from "../../../../languageHandler"; @@ -45,7 +46,6 @@ import BaseDialog from "../../../../components/views/dialogs/BaseDialog"; import Spinner from "../../../../components/views/elements/Spinner"; import InteractiveAuthDialog from "../../../../components/views/dialogs/InteractiveAuthDialog"; import { IValidationResult } from "../../../../components/views/elements/Validation"; -import { Icon as CheckmarkIcon } from "../../../../../res/img/element-icons/check.svg"; import PassphraseConfirmField from "../../../../components/views/auth/PassphraseConfirmField"; import { initialiseDehydration } from "../../../../utils/device/dehydration"; diff --git a/src/components/structures/AutocompleteInput.tsx b/src/components/structures/AutocompleteInput.tsx index 65d48e45f6..3ac4f16f78 100644 --- a/src/components/structures/AutocompleteInput.tsx +++ b/src/components/structures/AutocompleteInput.tsx @@ -16,13 +16,13 @@ limitations under the License. import React, { useState, ReactNode, ChangeEvent, KeyboardEvent, useRef, ReactElement } from "react"; import classNames from "classnames"; +import { Icon as SearchIcon } from "@vector-im/compound-design-tokens/icons/search.svg"; import Autocompleter from "../../autocomplete/AutocompleteProvider"; import { Key } from "../../Keyboard"; import { ICompletion } from "../../autocomplete/Autocompleter"; import AccessibleButton from "../../components/views/elements/AccessibleButton"; import { Icon as PillRemoveIcon } from "../../../res/img/icon-pill-remove.svg"; -import { Icon as SearchIcon } from "../../../res/img/element-icons/roomlist/search.svg"; import useFocus from "../../hooks/useFocus"; interface AutocompleteInputProps { diff --git a/src/components/structures/ErrorMessage.tsx b/src/components/structures/ErrorMessage.tsx index 0f1d56eb80..906cd65b90 100644 --- a/src/components/structures/ErrorMessage.tsx +++ b/src/components/structures/ErrorMessage.tsx @@ -15,8 +15,7 @@ limitations under the License. */ import React, { ReactNode } from "react"; - -import { Icon as WarningBadgeIcon } from "../../../res/img/compound/error-16px.svg"; +import { Icon as WarningBadgeIcon } from "@vector-im/compound-design-tokens/icons/error.svg"; interface ErrorMessageProps { message: string | ReactNode | null; diff --git a/src/components/structures/RoomStatusBar.tsx b/src/components/structures/RoomStatusBar.tsx index 311f6b89b5..44b419465a 100644 --- a/src/components/structures/RoomStatusBar.tsx +++ b/src/components/structures/RoomStatusBar.tsx @@ -16,8 +16,8 @@ limitations under the License. import React, { ReactNode } from "react"; import { EventStatus, MatrixEvent, Room, MatrixError, SyncState, SyncStateData } from "matrix-js-sdk/src/matrix"; +import { Icon as WarningIcon } from "@vector-im/compound-design-tokens/icons/warning.svg"; -import { Icon as WarningIcon } from "../../../res/img/feather-customised/warning-triangle.svg"; import { _t, _td } from "../../languageHandler"; import Resend from "../../Resend"; import dis from "../../dispatcher/dispatcher"; diff --git a/src/components/structures/auth/ForgotPassword.tsx b/src/components/structures/auth/ForgotPassword.tsx index 9487fc5ebe..41a7a536b3 100644 --- a/src/components/structures/auth/ForgotPassword.tsx +++ b/src/components/structures/auth/ForgotPassword.tsx @@ -19,6 +19,7 @@ limitations under the License. import React, { ReactNode } from "react"; import { logger } from "matrix-js-sdk/src/logger"; import { sleep } from "matrix-js-sdk/src/utils"; +import { Icon as CheckboxIcon } from "@vector-im/compound-design-tokens/icons/check.svg"; import { _t, _td } from "../../../languageHandler"; import Modal from "../../../Modal"; @@ -31,7 +32,6 @@ import AuthBody from "../../views/auth/AuthBody"; import PassphraseConfirmField from "../../views/auth/PassphraseConfirmField"; import StyledCheckbox from "../../views/elements/StyledCheckbox"; import { ValidatedServerConfig } from "../../../utils/ValidatedServerConfig"; -import { Icon as CheckboxIcon } from "../../../../res/img/compound/checkbox-32px.svg"; import { Icon as LockIcon } from "../../../../res/img/compound/padlock-32px.svg"; import QuestionDialog from "../../views/dialogs/QuestionDialog"; import { EnterEmail } from "./forgot-password/EnterEmail"; diff --git a/src/components/structures/auth/forgot-password/EnterEmail.tsx b/src/components/structures/auth/forgot-password/EnterEmail.tsx index 11e44e6562..d477df90e1 100644 --- a/src/components/structures/auth/forgot-password/EnterEmail.tsx +++ b/src/components/structures/auth/forgot-password/EnterEmail.tsx @@ -15,8 +15,8 @@ limitations under the License. */ import React, { ReactNode, useRef } from "react"; +import { Icon as EmailIcon } from "@vector-im/compound-design-tokens/icons/email-solid.svg"; -import { Icon as EmailIcon } from "../../../../../res/img/element-icons/Email-icon.svg"; import { _t, _td } from "../../../../languageHandler"; import EmailField from "../../../views/auth/EmailField"; import { ErrorMessage } from "../../ErrorMessage"; diff --git a/src/components/views/beacon/DialogSidebar.tsx b/src/components/views/beacon/DialogSidebar.tsx index 0de94266dd..de84d59ef8 100644 --- a/src/components/views/beacon/DialogSidebar.tsx +++ b/src/components/views/beacon/DialogSidebar.tsx @@ -16,8 +16,8 @@ limitations under the License. import React from "react"; import { Beacon } from "matrix-js-sdk/src/matrix"; +import { Icon as CloseIcon } from "@vector-im/compound-design-tokens/icons/close.svg"; -import { Icon as CloseIcon } from "../../../../res/img/image-view/close.svg"; import { _t } from "../../../languageHandler"; import AccessibleButton from "../elements/AccessibleButton"; import Heading from "../typography/Heading"; diff --git a/src/components/views/beacon/RoomLiveShareWarning.tsx b/src/components/views/beacon/RoomLiveShareWarning.tsx index 0d9a5bed0b..a7d65477aa 100644 --- a/src/components/views/beacon/RoomLiveShareWarning.tsx +++ b/src/components/views/beacon/RoomLiveShareWarning.tsx @@ -16,6 +16,7 @@ limitations under the License. import React from "react"; import { Room } from "matrix-js-sdk/src/matrix"; +import { Icon as CloseIcon } from "@vector-im/compound-design-tokens/icons/close.svg"; import { _t } from "../../../languageHandler"; import { useEventEmitterState } from "../../../hooks/useEventEmitter"; @@ -24,7 +25,6 @@ import { useOwnLiveBeacons } from "../../../utils/beacon"; import AccessibleButton, { ButtonEvent } from "../elements/AccessibleButton"; import Spinner from "../elements/Spinner"; import StyledLiveBeaconIcon from "./StyledLiveBeaconIcon"; -import { Icon as CloseIcon } from "../../../../res/img/image-view/close.svg"; import LiveTimeRemaining from "./LiveTimeRemaining"; import dispatcher from "../../../dispatcher/dispatcher"; import { ViewRoomPayload } from "../../../dispatcher/payloads/ViewRoomPayload"; diff --git a/src/components/views/context_menus/KebabContextMenu.tsx b/src/components/views/context_menus/KebabContextMenu.tsx index f963933bdb..ac0166cbf2 100644 --- a/src/components/views/context_menus/KebabContextMenu.tsx +++ b/src/components/views/context_menus/KebabContextMenu.tsx @@ -15,8 +15,8 @@ limitations under the License. */ import React from "react"; +import { Icon as ContextMenuIcon } from "@vector-im/compound-design-tokens/icons/overflow-horizontal.svg"; -import { Icon as ContextMenuIcon } from "../../../../res/img/element-icons/context-menu.svg"; import { ChevronFace, ContextMenuButton, MenuProps, useContextMenu } from "../../structures/ContextMenu"; import { ButtonProps } from "../elements/AccessibleButton"; import IconizedContextMenu, { IconizedContextMenuOptionList } from "./IconizedContextMenu"; diff --git a/src/components/views/dialogs/ForwardDialog.tsx b/src/components/views/dialogs/ForwardDialog.tsx index 28de13381e..ccdd681361 100644 --- a/src/components/views/dialogs/ForwardDialog.tsx +++ b/src/components/views/dialogs/ForwardDialog.tsx @@ -287,7 +287,11 @@ const ForwardDialog: React.FC = ({ matrixClient: cli, event, permalinkCr + } name={text} showPresence={false} diff --git a/src/components/views/dialogs/UploadConfirmDialog.tsx b/src/components/views/dialogs/UploadConfirmDialog.tsx index b82e87c4aa..d0737352a4 100644 --- a/src/components/views/dialogs/UploadConfirmDialog.tsx +++ b/src/components/views/dialogs/UploadConfirmDialog.tsx @@ -16,8 +16,8 @@ limitations under the License. */ import React from "react"; +import { Icon as FileIcon } from "@vector-im/compound-design-tokens/icons/files.svg"; -import { Icon as FileIcon } from "../../../../res/img/feather-customised/files.svg"; import { _t } from "../../../languageHandler"; import { getBlobSafeMimeType } from "../../../utils/blobs"; import BaseDialog from "./BaseDialog"; diff --git a/src/components/views/elements/AppPermission.tsx b/src/components/views/elements/AppPermission.tsx index fd788290c0..aa160bd90a 100644 --- a/src/components/views/elements/AppPermission.tsx +++ b/src/components/views/elements/AppPermission.tsx @@ -19,6 +19,7 @@ limitations under the License. import React from "react"; import { RoomMember } from "matrix-js-sdk/src/matrix"; import { Tooltip } from "@vector-im/compound-web"; +import { Icon as HelpIcon } from "@vector-im/compound-design-tokens/icons/help.svg"; import { _t } from "../../../languageHandler"; import SdkConfig from "../../../SdkConfig"; @@ -29,7 +30,6 @@ import BaseAvatar from "../avatars/BaseAvatar"; import Heading from "../typography/Heading"; import AccessibleButton from "./AccessibleButton"; import { parseUrl } from "../../../utils/UrlUtils"; -import { Icon as HelpIcon } from "../../../../res/img/feather-customised/help-circle.svg"; interface IProps { url: string; diff --git a/src/components/views/elements/AppTile.tsx b/src/components/views/elements/AppTile.tsx index 0820ac62d1..70b18668c9 100644 --- a/src/components/views/elements/AppTile.tsx +++ b/src/components/views/elements/AppTile.tsx @@ -24,6 +24,9 @@ import { Room, RoomEvent } from "matrix-js-sdk/src/matrix"; import { KnownMembership } from "matrix-js-sdk/src/types"; import { logger } from "matrix-js-sdk/src/logger"; import { ApprovalOpts, WidgetLifecycle } from "@matrix-org/react-sdk-module-api/lib/lifecycles/WidgetLifecycle"; +import { Icon as MenuIcon } from "@vector-im/compound-design-tokens/icons/overflow-horizontal.svg"; +import { Icon as MaximiseIcon } from "@vector-im/compound-design-tokens/icons/expand.svg"; +import { Icon as CollapseIcon } from "@vector-im/compound-design-tokens/icons/collapse.svg"; import AccessibleButton from "./AccessibleButton"; import { _t } from "../../../languageHandler"; @@ -41,11 +44,8 @@ import { showContextMenu, WidgetContextMenu } from "../context_menus/WidgetConte import WidgetAvatar from "../avatars/WidgetAvatar"; import LegacyCallHandler from "../../../LegacyCallHandler"; import { IApp, isAppWidget } from "../../../stores/WidgetStore"; -import { Icon as CollapseIcon } from "../../../../res/img/element-icons/minimise-collapse.svg"; -import { Icon as MaximiseIcon } from "../../../../res/img/element-icons/maximise-expand.svg"; import { Icon as MinimiseIcon } from "../../../../res/img/element-icons/minus-button.svg"; import { Icon as PopoutIcon } from "../../../../res/img/feather-customised/widget/external-link.svg"; -import { Icon as MenuIcon } from "../../../../res/img/element-icons/room/ellipsis.svg"; import { Container, WidgetLayoutStore } from "../../../stores/widgets/WidgetLayoutStore"; import { OwnProfileStore } from "../../../stores/OwnProfileStore"; import { UPDATE_EVENT } from "../../../stores/AsyncStore"; diff --git a/src/components/views/elements/FilterDropdown.tsx b/src/components/views/elements/FilterDropdown.tsx index 8dd5b0173d..3fdfe5d78a 100644 --- a/src/components/views/elements/FilterDropdown.tsx +++ b/src/components/views/elements/FilterDropdown.tsx @@ -16,8 +16,8 @@ limitations under the License. import React, { ReactElement } from "react"; import classNames from "classnames"; +import { Icon as CheckmarkIcon } from "@vector-im/compound-design-tokens/icons/check.svg"; -import { Icon as CheckmarkIcon } from "../../../../res/img/element-icons/roomlist/checkmark.svg"; import Dropdown, { DropdownProps } from "./Dropdown"; import { NonEmptyArray } from "../../../@types/common"; diff --git a/src/components/views/elements/Pill.tsx b/src/components/views/elements/Pill.tsx index 52ad1e2b89..0961b0ee78 100644 --- a/src/components/views/elements/Pill.tsx +++ b/src/components/views/elements/Pill.tsx @@ -18,6 +18,7 @@ import React, { ReactElement } from "react"; import classNames from "classnames"; import { Room, RoomMember } from "matrix-js-sdk/src/matrix"; import { Tooltip } from "@vector-im/compound-web"; +import { Icon as UserIcon } from "@vector-im/compound-design-tokens/icons/user-profile-solid.svg"; import { MatrixClientPeg } from "../../../MatrixClientPeg"; import MatrixClientContext from "../../../contexts/MatrixClientContext"; @@ -26,7 +27,6 @@ import RoomAvatar from "../avatars/RoomAvatar"; import MemberAvatar from "../avatars/MemberAvatar"; import { _t } from "../../../languageHandler"; import { Icon as LinkIcon } from "../../../../res/img/element-icons/room/composer/link.svg"; -import { Icon as UserIcon } from "../../../../res/img/compound/user.svg"; export enum PillType { UserMention = "TYPE_USER_MENTION", diff --git a/src/components/views/elements/Tag.tsx b/src/components/views/elements/Tag.tsx index 6ce2ba69fc..67483045f2 100644 --- a/src/components/views/elements/Tag.tsx +++ b/src/components/views/elements/Tag.tsx @@ -15,9 +15,9 @@ limitations under the License. */ import React, { DetailedHTMLProps, HTMLAttributes } from "react"; +import { Icon as CancelRounded } from "@vector-im/compound-design-tokens/icons/close.svg"; import AccessibleButton from "./AccessibleButton"; -import { Icon as CancelRounded } from "../../../../res/img/element-icons/cancel-rounded.svg"; interface IProps extends DetailedHTMLProps, HTMLDivElement> { icon?: () => JSX.Element; diff --git a/src/components/views/location/MapFallback.tsx b/src/components/views/location/MapFallback.tsx index 756bf23e9e..6cf16b018e 100644 --- a/src/components/views/location/MapFallback.tsx +++ b/src/components/views/location/MapFallback.tsx @@ -16,8 +16,8 @@ limitations under the License. import React from "react"; import classNames from "classnames"; +import { Icon as LocationMarkerIcon } from "@vector-im/compound-design-tokens/icons/location-pin-solid.svg"; -import { Icon as LocationMarkerIcon } from "../../../../res/img/element-icons/location.svg"; import { Icon as MapFallbackImage } from "../../../../res/img/location/map.svg"; import Spinner from "../elements/Spinner"; diff --git a/src/components/views/location/Marker.tsx b/src/components/views/location/Marker.tsx index 5045d87a03..a217ba789e 100644 --- a/src/components/views/location/Marker.tsx +++ b/src/components/views/location/Marker.tsx @@ -17,8 +17,8 @@ limitations under the License. import React, { ReactNode, useState } from "react"; import classNames from "classnames"; import { RoomMember } from "matrix-js-sdk/src/matrix"; +import { Icon as LocationIcon } from "@vector-im/compound-design-tokens/icons/location-pin-solid.svg"; -import { Icon as LocationIcon } from "../../../../res/img/element-icons/location.svg"; import { getUserNameColorClass } from "../../../utils/FormattingUtils"; import MemberAvatar from "../avatars/MemberAvatar"; diff --git a/src/components/views/location/ShareDialogButtons.tsx b/src/components/views/location/ShareDialogButtons.tsx index dc976b4c63..8c389e2295 100644 --- a/src/components/views/location/ShareDialogButtons.tsx +++ b/src/components/views/location/ShareDialogButtons.tsx @@ -15,10 +15,10 @@ limitations under the License. */ import React from "react"; +import { Icon as CloseIcon } from "@vector-im/compound-design-tokens/icons/close.svg"; +import { Icon as BackIcon } from "@vector-im/compound-design-tokens/icons/chevron-left.svg"; import AccessibleButton from "../elements/AccessibleButton"; -import { Icon as BackIcon } from "../../../../res/img/element-icons/caret-left.svg"; -import { Icon as CloseIcon } from "../../../../res/img/element-icons/cancel-rounded.svg"; import { _t } from "../../../languageHandler"; interface Props { diff --git a/src/components/views/location/ShareType.tsx b/src/components/views/location/ShareType.tsx index 6249774d46..47fefb1bdc 100644 --- a/src/components/views/location/ShareType.tsx +++ b/src/components/views/location/ShareType.tsx @@ -15,6 +15,7 @@ limitations under the License. */ import React, { HTMLAttributes, useContext } from "react"; +import { Icon as LocationIcon } from "@vector-im/compound-design-tokens/icons/location-pin-solid.svg"; import MatrixClientContext from "../../../contexts/MatrixClientContext"; import { _t } from "../../../languageHandler"; @@ -22,7 +23,6 @@ import { OwnProfileStore } from "../../../stores/OwnProfileStore"; import BaseAvatar from "../avatars/BaseAvatar"; import AccessibleButton, { ButtonEvent } from "../elements/AccessibleButton"; import Heading from "../typography/Heading"; -import { Icon as LocationIcon } from "../../../../res/img/element-icons/location.svg"; import { LocationShareType } from "./shareLocation"; import StyledLiveBeaconIcon from "../beacon/StyledLiveBeaconIcon"; diff --git a/src/components/views/location/ZoomButtons.tsx b/src/components/views/location/ZoomButtons.tsx index 970835cffd..04c7c5d055 100644 --- a/src/components/views/location/ZoomButtons.tsx +++ b/src/components/views/location/ZoomButtons.tsx @@ -19,7 +19,7 @@ import * as maplibregl from "maplibre-gl"; import { _t } from "../../../languageHandler"; import AccessibleButton from "../elements/AccessibleButton"; -import { Icon as PlusIcon } from "../../../../res/img/element-icons/plus-button.svg"; +import { Icon as PlusIcon } from "@vector-im/compound-design-tokens/icons/plus-button.svg"; import { Icon as MinusIcon } from "../../../../res/img/element-icons/minus-button.svg"; interface Props { diff --git a/src/components/views/messages/MessageActionBar.tsx b/src/components/views/messages/MessageActionBar.tsx index 3cfc252b8c..24695b1547 100644 --- a/src/components/views/messages/MessageActionBar.tsx +++ b/src/components/views/messages/MessageActionBar.tsx @@ -26,14 +26,14 @@ import { M_BEACON_INFO, } from "matrix-js-sdk/src/matrix"; import classNames from "classnames"; +import { Icon as ThreadIcon } from "@vector-im/compound-design-tokens/icons/threads.svg"; +import { Icon as ReplyIcon } from "@vector-im/compound-design-tokens/icons/reply.svg"; +import { Icon as ContextMenuIcon } from "@vector-im/compound-design-tokens/icons/overflow-horizontal.svg"; +import { Icon as ResendIcon } from "@vector-im/compound-design-tokens/icons/restart.svg"; +import { Icon as TrashcanIcon } from "@vector-im/compound-design-tokens/icons/delete.svg"; -import { Icon as ContextMenuIcon } from "../../../../res/img/element-icons/context-menu.svg"; import { Icon as EditIcon } from "../../../../res/img/element-icons/room/message-bar/edit.svg"; import { Icon as EmojiIcon } from "../../../../res/img/element-icons/room/message-bar/emoji.svg"; -import { Icon as ResendIcon } from "../../../../res/img/element-icons/retry.svg"; -import { Icon as ThreadIcon } from "../../../../res/img/element-icons/message/thread.svg"; -import { Icon as TrashcanIcon } from "../../../../res/img/element-icons/trashcan.svg"; -import { Icon as ReplyIcon } from "../../../../res/img/element-icons/room/message-bar/reply.svg"; import { Icon as ExpandMessageIcon } from "../../../../res/img/element-icons/expand-message.svg"; import { Icon as CollapseMessageIcon } from "../../../../res/img/element-icons/collapse-message.svg"; import type { Relations } from "matrix-js-sdk/src/matrix"; diff --git a/src/components/views/pips/WidgetPip.tsx b/src/components/views/pips/WidgetPip.tsx index 9bba2ccc53..b9e39a18d7 100644 --- a/src/components/views/pips/WidgetPip.tsx +++ b/src/components/views/pips/WidgetPip.tsx @@ -16,6 +16,7 @@ limitations under the License. import React, { FC, MutableRefObject, useCallback, useMemo } from "react"; import { Room, RoomEvent } from "matrix-js-sdk/src/matrix"; +import { Icon as BackIcon } from "@vector-im/compound-design-tokens/icons/arrow-left.svg"; import PersistentApp from "../elements/PersistentApp"; import defaultDispatcher from "../../../dispatcher/dispatcher"; @@ -27,7 +28,6 @@ import { Container, WidgetLayoutStore } from "../../../stores/widgets/WidgetLayo import { useTypedEventEmitterState } from "../../../hooks/useEventEmitter"; import Toolbar from "../../../accessibility/Toolbar"; import { RovingAccessibleButton } from "../../../accessibility/RovingTabIndex"; -import { Icon as BackIcon } from "../../../../res/img/element-icons/back.svg"; import { Icon as HangupIcon } from "../../../../res/img/element-icons/call/hangup.svg"; import { _t } from "../../../languageHandler"; import { WidgetType } from "../../../widgets/WidgetType"; diff --git a/src/components/views/polls/pollHistory/PollDetailHeader.tsx b/src/components/views/polls/pollHistory/PollDetailHeader.tsx index 582f0188cc..629d4ce436 100644 --- a/src/components/views/polls/pollHistory/PollDetailHeader.tsx +++ b/src/components/views/polls/pollHistory/PollDetailHeader.tsx @@ -15,8 +15,8 @@ limitations under the License. */ import React from "react"; +import { Icon as LeftCaretIcon } from "@vector-im/compound-design-tokens/icons/chevron-left.svg"; -import { Icon as LeftCaretIcon } from "../../../../../res/img/element-icons/caret-left.svg"; import { _t } from "../../../../languageHandler"; import AccessibleButton from "../../elements/AccessibleButton"; import { PollHistoryFilter } from "./types"; diff --git a/src/components/views/right_panel/PinnedMessagesCard.tsx b/src/components/views/right_panel/PinnedMessagesCard.tsx index f813dd3427..3c490a8ee7 100644 --- a/src/components/views/right_panel/PinnedMessagesCard.tsx +++ b/src/components/views/right_panel/PinnedMessagesCard.tsx @@ -17,10 +17,10 @@ limitations under the License. import React, { useCallback, useContext, useEffect, useState } from "react"; import { Room, RoomEvent, RoomStateEvent, MatrixEvent, EventType, RelationType } from "matrix-js-sdk/src/matrix"; import { logger } from "matrix-js-sdk/src/logger"; +import { Icon as ReplyIcon } from "@vector-im/compound-design-tokens/icons/reply.svg"; +import { Icon as ContextMenuIcon } from "@vector-im/compound-design-tokens/icons/overflow-horizontal.svg"; -import { Icon as ContextMenuIcon } from "../../../../res/img/element-icons/context-menu.svg"; import { Icon as EmojiIcon } from "../../../../res/img/element-icons/room/message-bar/emoji.svg"; -import { Icon as ReplyIcon } from "../../../../res/img/element-icons/room/message-bar/reply.svg"; import { _t } from "../../../languageHandler"; import BaseCard from "./BaseCard"; import Spinner from "../elements/Spinner"; diff --git a/src/components/views/rooms/EntityTile.tsx b/src/components/views/rooms/EntityTile.tsx index cfb579b11c..f579bcff6a 100644 --- a/src/components/views/rooms/EntityTile.tsx +++ b/src/components/views/rooms/EntityTile.tsx @@ -149,7 +149,7 @@ export default class EntityTile extends React.PureComponent {
{_t("action|invite")} diff --git a/src/components/views/rooms/EventTile/EventTileThreadToolbar.tsx b/src/components/views/rooms/EventTile/EventTileThreadToolbar.tsx index bc41f20b22..d31a8258f7 100644 --- a/src/components/views/rooms/EventTile/EventTileThreadToolbar.tsx +++ b/src/components/views/rooms/EventTile/EventTileThreadToolbar.tsx @@ -15,11 +15,11 @@ limitations under the License. */ import React from "react"; +import { Icon as LinkIcon } from "@vector-im/compound-design-tokens/icons/link.svg"; import { RovingAccessibleButton } from "../../../../accessibility/RovingTabIndex"; import Toolbar from "../../../../accessibility/Toolbar"; import { _t } from "../../../../languageHandler"; -import { Icon as LinkIcon } from "../../../../../res/img/element-icons/link.svg"; import { Icon as ViewInRoomIcon } from "../../../../../res/img/element-icons/view-in-room.svg"; import { ButtonEvent } from "../../elements/AccessibleButton"; diff --git a/src/components/views/rooms/LinkPreviewGroup.tsx b/src/components/views/rooms/LinkPreviewGroup.tsx index c940e9fce7..c575f04df5 100644 --- a/src/components/views/rooms/LinkPreviewGroup.tsx +++ b/src/components/views/rooms/LinkPreviewGroup.tsx @@ -78,7 +78,7 @@ const LinkPreviewGroup: React.FC = ({ links, mxEvent, onCancelClick, onH className="mx_filterFlipColor" alt="" role="presentation" - src={require("../../../../res/img/cancel.svg").default} + src={require("@vector-im/compound-design-tokens/icons/close.svg").default} width="18" height="18" draggable="false" diff --git a/src/components/views/rooms/MemberList.tsx b/src/components/views/rooms/MemberList.tsx index dea4dd58d3..796c84a05f 100644 --- a/src/components/views/rooms/MemberList.tsx +++ b/src/components/views/rooms/MemberList.tsx @@ -247,7 +247,11 @@ export default class MemberList extends React.Component { + } name={text} showPresence={false} diff --git a/src/components/views/rooms/RoomKnocksBar.tsx b/src/components/views/rooms/RoomKnocksBar.tsx index 9feb23a147..db7f52bf1d 100644 --- a/src/components/views/rooms/RoomKnocksBar.tsx +++ b/src/components/views/rooms/RoomKnocksBar.tsx @@ -17,9 +17,9 @@ limitations under the License. import { EventTimeline, JoinRule, MatrixError, Room, RoomStateEvent } from "matrix-js-sdk/src/matrix"; import { KnownMembership } from "matrix-js-sdk/src/types"; import React, { ReactElement, ReactNode, useCallback, useState, VFC } from "react"; +import { Icon as CheckIcon } from "@vector-im/compound-design-tokens/icons/check.svg"; +import { Icon as XIcon } from "@vector-im/compound-design-tokens/icons/close.svg"; -import { Icon as CheckIcon } from "../../../../res/img/feather-customised/check.svg"; -import { Icon as XIcon } from "../../../../res/img/feather-customised/x.svg"; import dis from "../../../dispatcher/dispatcher"; import { useTypedEventEmitterState } from "../../../hooks/useEventEmitter"; import { _t } from "../../../languageHandler"; diff --git a/src/components/views/rooms/RoomTileSubtitle.tsx b/src/components/views/rooms/RoomTileSubtitle.tsx index f3f8604aca..55b3fd48c1 100644 --- a/src/components/views/rooms/RoomTileSubtitle.tsx +++ b/src/components/views/rooms/RoomTileSubtitle.tsx @@ -16,12 +16,12 @@ limitations under the License. import React from "react"; import classNames from "classnames"; +import { Icon as ThreadIcon } from "@vector-im/compound-design-tokens/icons/threads-solid.svg"; import { MessagePreview } from "../../../stores/room-list/MessagePreviewStore"; import { Call } from "../../../models/Call"; import { RoomTileCallSummary } from "./RoomTileCallSummary"; import { VoiceBroadcastRoomSubtitle } from "../../../voice-broadcast"; -import { Icon as ThreadIcon } from "../../../../res/img/compound/thread-16px.svg"; interface Props { call: Call | null; diff --git a/src/components/views/rooms/wysiwyg_composer/components/FormattingButtons.tsx b/src/components/views/rooms/wysiwyg_composer/components/FormattingButtons.tsx index 0b09654b7f..ad1edb9733 100644 --- a/src/components/views/rooms/wysiwyg_composer/components/FormattingButtons.tsx +++ b/src/components/views/rooms/wysiwyg_composer/components/FormattingButtons.tsx @@ -17,19 +17,19 @@ limitations under the License. import React, { MouseEventHandler, ReactNode } from "react"; import { FormattingFunctions, AllActionStates, ActionState } from "@matrix-org/matrix-wysiwyg"; import classNames from "classnames"; +import { Icon as BoldIcon } from "@vector-im/compound-design-tokens/icons/bold.svg"; +import { Icon as BulletedListIcon } from "@vector-im/compound-design-tokens/icons/list-bulleted.svg"; +import { Icon as CodeBlockIcon } from "@vector-im/compound-design-tokens/icons/code.svg"; +import { Icon as UnIndentIcon } from "@vector-im/compound-design-tokens/icons/indent-decrease.svg"; +import { Icon as IndentIcon } from "@vector-im/compound-design-tokens/icons/indent-increase.svg"; +import { Icon as InlineCodeIcon } from "@vector-im/compound-design-tokens/icons/inline-code.svg"; +import { Icon as ItalicIcon } from "@vector-im/compound-design-tokens/icons/italic.svg"; +import { Icon as NumberedListIcon } from "@vector-im/compound-design-tokens/icons/list-numbered.svg"; +import { Icon as QuoteIcon } from "@vector-im/compound-design-tokens/icons/quote.svg"; +import { Icon as StrikeThroughIcon } from "@vector-im/compound-design-tokens/icons/strikethrough.svg"; +import { Icon as UnderlineIcon } from "@vector-im/compound-design-tokens/icons/underline.svg"; -import { Icon as BoldIcon } from "../../../../../../res/img/element-icons/room/composer/bold.svg"; -import { Icon as ItalicIcon } from "../../../../../../res/img/element-icons/room/composer/italic.svg"; -import { Icon as UnderlineIcon } from "../../../../../../res/img/element-icons/room/composer/underline.svg"; -import { Icon as StrikeThroughIcon } from "../../../../../../res/img/element-icons/room/composer/strikethrough.svg"; -import { Icon as QuoteIcon } from "../../../../../../res/img/element-icons/room/composer/quote.svg"; -import { Icon as InlineCodeIcon } from "../../../../../../res/img/element-icons/room/composer/inline_code.svg"; import { Icon as LinkIcon } from "../../../../../../res/img/element-icons/room/composer/link.svg"; -import { Icon as BulletedListIcon } from "../../../../../../res/img/element-icons/room/composer/bulleted_list.svg"; -import { Icon as NumberedListIcon } from "../../../../../../res/img/element-icons/room/composer/numbered_list.svg"; -import { Icon as CodeBlockIcon } from "../../../../../../res/img/element-icons/room/composer/code_block.svg"; -import { Icon as IndentIcon } from "../../../../../../res/img/element-icons/room/composer/indent_increase.svg"; -import { Icon as UnIndentIcon } from "../../../../../../res/img/element-icons/room/composer/indent_decrease.svg"; import { _t } from "../../../../../languageHandler"; import AccessibleButton, { ButtonEvent } from "../../../elements/AccessibleButton"; import { openLinkModal } from "./LinkModal"; diff --git a/src/components/views/settings/devices/DeviceExpandDetailsButton.tsx b/src/components/views/settings/devices/DeviceExpandDetailsButton.tsx index 791b612591..ef52b1a520 100644 --- a/src/components/views/settings/devices/DeviceExpandDetailsButton.tsx +++ b/src/components/views/settings/devices/DeviceExpandDetailsButton.tsx @@ -17,7 +17,7 @@ limitations under the License. import classNames from "classnames"; import React, { ComponentProps } from "react"; -import { Icon as CaretIcon } from "../../../../../res/img/feather-customised/dropdown-arrow.svg"; +import { Icon as CaretIcon } from "@vector-im/compound-design-tokens/icons/chevron-down.svg"; import { _t } from "../../../../languageHandler"; import AccessibleButton from "../../elements/AccessibleButton"; diff --git a/src/components/views/settings/tabs/room/PeopleRoomSettingsTab.tsx b/src/components/views/settings/tabs/room/PeopleRoomSettingsTab.tsx index 22c2bc471f..f4ddf5a3e4 100644 --- a/src/components/views/settings/tabs/room/PeopleRoomSettingsTab.tsx +++ b/src/components/views/settings/tabs/room/PeopleRoomSettingsTab.tsx @@ -17,9 +17,9 @@ limitations under the License. import { EventTimeline, MatrixError, Room, RoomMember, RoomStateEvent } from "matrix-js-sdk/src/matrix"; import { KnownMembership } from "matrix-js-sdk/src/types"; import React, { useCallback, useState, VFC } from "react"; +import { Icon as CheckIcon } from "@vector-im/compound-design-tokens/icons/check.svg"; +import { Icon as XIcon } from "@vector-im/compound-design-tokens/icons/close.svg"; -import { Icon as CheckIcon } from "../../../../../../res/img/feather-customised/check.svg"; -import { Icon as XIcon } from "../../../../../../res/img/feather-customised/x.svg"; import { formatRelativeTime } from "../../../../../DateUtils"; import { useTypedEventEmitterState } from "../../../../../hooks/useEventEmitter"; import { _t } from "../../../../../languageHandler"; diff --git a/src/components/views/settings/tabs/user/SidebarUserSettingsTab.tsx b/src/components/views/settings/tabs/user/SidebarUserSettingsTab.tsx index 6f966948f5..8806145eb6 100644 --- a/src/components/views/settings/tabs/user/SidebarUserSettingsTab.tsx +++ b/src/components/views/settings/tabs/user/SidebarUserSettingsTab.tsx @@ -16,10 +16,10 @@ limitations under the License. import React, { ChangeEvent, useMemo } from "react"; import { Icon as CameraCircle } from "@vector-im/compound-design-tokens/icons/video-call-solid.svg"; +import { Icon as MembersIcon } from "@vector-im/compound-design-tokens/icons/user-profile-solid.svg"; +import { Icon as FavoriteIcon } from "@vector-im/compound-design-tokens/icons/favourite-solid.svg"; +import { Icon as HomeIcon } from "@vector-im/compound-design-tokens/icons/home-solid.svg"; -import { Icon as HomeIcon } from "../../../../../../res/img/element-icons/home.svg"; -import { Icon as FavoriteIcon } from "../../../../../../res/img/element-icons/roomlist/favorite.svg"; -import { Icon as MembersIcon } from "../../../../../../res/img/element-icons/room/members.svg"; import { Icon as HashCircleIcon } from "../../../../../../res/img/element-icons/roomlist/hash-circle.svg"; import { _t } from "../../../../../languageHandler"; import SettingsStore from "../../../../../settings/SettingsStore"; diff --git a/src/components/views/spaces/QuickSettingsButton.tsx b/src/components/views/spaces/QuickSettingsButton.tsx index cf031e4ff1..f30101dcc2 100644 --- a/src/components/views/spaces/QuickSettingsButton.tsx +++ b/src/components/views/spaces/QuickSettingsButton.tsx @@ -16,6 +16,9 @@ limitations under the License. import React from "react"; import classNames from "classnames"; +import { Icon as EllipsisIcon } from "@vector-im/compound-design-tokens/icons/overflow-horizontal.svg"; +import { Icon as MembersIcon } from "@vector-im/compound-design-tokens/icons/user-profile-solid.svg"; +import { Icon as FavoriteIcon } from "@vector-im/compound-design-tokens/icons/favourite-solid.svg"; import { _t } from "../../../languageHandler"; import ContextMenu, { alwaysAboveRightOf, ChevronFace, useContextMenu } from "../../structures/ContextMenu"; @@ -29,9 +32,6 @@ import { Action } from "../../../dispatcher/actions"; import { UserTab } from "../dialogs/UserTab"; import QuickThemeSwitcher from "./QuickThemeSwitcher"; import { Icon as PinUprightIcon } from "../../../../res/img/element-icons/room/pin-upright.svg"; -import { Icon as EllipsisIcon } from "../../../../res/img/element-icons/room/ellipsis.svg"; -import { Icon as MembersIcon } from "../../../../res/img/element-icons/room/members.svg"; -import { Icon as FavoriteIcon } from "../../../../res/img/element-icons/roomlist/favorite.svg"; import Modal from "../../../Modal"; import DevtoolsDialog from "../dialogs/DevtoolsDialog"; import { SdkContextClass } from "../../../contexts/SDKContext"; diff --git a/src/voice-broadcast/components/atoms/VoiceBroadcastError.tsx b/src/voice-broadcast/components/atoms/VoiceBroadcastError.tsx index 9c312ac9e5..29a5c5b1fa 100644 --- a/src/voice-broadcast/components/atoms/VoiceBroadcastError.tsx +++ b/src/voice-broadcast/components/atoms/VoiceBroadcastError.tsx @@ -15,8 +15,7 @@ limitations under the License. */ import React from "react"; - -import { Icon as WarningIcon } from "../../../../res/img/compound/error-16px.svg"; +import { Icon as WarningIcon } from "@vector-im/compound-design-tokens/icons/error.svg"; interface Props { message: string; diff --git a/src/voice-broadcast/components/atoms/VoiceBroadcastHeader.tsx b/src/voice-broadcast/components/atoms/VoiceBroadcastHeader.tsx index 34a2a81a20..81c4bf1498 100644 --- a/src/voice-broadcast/components/atoms/VoiceBroadcastHeader.tsx +++ b/src/voice-broadcast/components/atoms/VoiceBroadcastHeader.tsx @@ -14,12 +14,12 @@ limitations under the License. import React from "react"; import { Room } from "matrix-js-sdk/src/matrix"; import classNames from "classnames"; +import { Icon as MicrophoneIcon } from "@vector-im/compound-design-tokens/icons/mic-on-solid.svg"; +import { Icon as XIcon } from "@vector-im/compound-design-tokens/icons/close.svg"; import { LiveBadge, VoiceBroadcastLiveness } from "../.."; import { Icon as LiveIcon } from "../../../../res/img/compound/live-16px.svg"; -import { Icon as MicrophoneIcon } from "../../../../res/img/compound/mic-16px.svg"; import { Icon as TimerIcon } from "../../../../res/img/compound/timer-16px.svg"; -import { Icon as XIcon } from "../../../../res/img/compound/close-16px.svg"; import { _t } from "../../../languageHandler"; import RoomAvatar from "../../../components/views/avatars/RoomAvatar"; import AccessibleButton, { ButtonEvent } from "../../../components/views/elements/AccessibleButton"; diff --git a/src/voice-broadcast/components/atoms/VoiceBroadcastPlaybackControl.tsx b/src/voice-broadcast/components/atoms/VoiceBroadcastPlaybackControl.tsx index d9285d4afe..eb8342a158 100644 --- a/src/voice-broadcast/components/atoms/VoiceBroadcastPlaybackControl.tsx +++ b/src/voice-broadcast/components/atoms/VoiceBroadcastPlaybackControl.tsx @@ -15,9 +15,9 @@ limitations under the License. */ import React, { ReactElement } from "react"; +import { Icon as PauseIcon } from "@vector-im/compound-design-tokens/icons/pause-solid.svg"; +import { Icon as PlayIcon } from "@vector-im/compound-design-tokens/icons/play-solid.svg"; -import { Icon as PlayIcon } from "../../../../res/img/compound/play-16.svg"; -import { Icon as PauseIcon } from "../../../../res/img/compound/pause-12.svg"; import { _t } from "../../../languageHandler"; import { VoiceBroadcastControl, VoiceBroadcastPlaybackState } from "../.."; diff --git a/src/voice-broadcast/components/atoms/VoiceBroadcastRecordingConnectionError.tsx b/src/voice-broadcast/components/atoms/VoiceBroadcastRecordingConnectionError.tsx index 9072fbe92c..f24b47180d 100644 --- a/src/voice-broadcast/components/atoms/VoiceBroadcastRecordingConnectionError.tsx +++ b/src/voice-broadcast/components/atoms/VoiceBroadcastRecordingConnectionError.tsx @@ -15,8 +15,8 @@ limitations under the License. */ import React from "react"; +import { Icon as WarningIcon } from "@vector-im/compound-design-tokens/icons/error.svg"; -import { Icon as WarningIcon } from "../../../../res/img/compound/error-16px.svg"; import { _t } from "../../../languageHandler"; export const VoiceBroadcastRecordingConnectionError: React.FC = () => { diff --git a/src/voice-broadcast/components/molecules/VoiceBroadcastRecordingPip.tsx b/src/voice-broadcast/components/molecules/VoiceBroadcastRecordingPip.tsx index 46ca3f9319..bfb2a798a9 100644 --- a/src/voice-broadcast/components/molecules/VoiceBroadcastRecordingPip.tsx +++ b/src/voice-broadcast/components/molecules/VoiceBroadcastRecordingPip.tsx @@ -15,6 +15,8 @@ limitations under the License. */ import React, { useRef, useState } from "react"; +import { Icon as PauseIcon } from "@vector-im/compound-design-tokens/icons/pause-solid.svg"; +import { Icon as MicrophoneIcon } from "@vector-im/compound-design-tokens/icons/mic-on-solid.svg"; import { VoiceBroadcastControl, @@ -26,9 +28,7 @@ import { import { useVoiceBroadcastRecording } from "../../hooks/useVoiceBroadcastRecording"; import { VoiceBroadcastHeader } from "../atoms/VoiceBroadcastHeader"; import { Icon as StopIcon } from "../../../../res/img/compound/stop-16.svg"; -import { Icon as PauseIcon } from "../../../../res/img/compound/pause-12.svg"; import { Icon as RecordIcon } from "../../../../res/img/compound/record-10px.svg"; -import { Icon as MicrophoneIcon } from "../../../../res/img/compound/mic-16px.svg"; import { _t } from "../../../languageHandler"; import { useAudioDeviceSelection } from "../../../hooks/useAudioDeviceSelection"; import { DevicesContextMenu } from "../../../components/views/audio_messages/DevicesContextMenu"; diff --git a/src/voice-broadcast/components/molecules/VoiceBroadcastSmallPlaybackBody.tsx b/src/voice-broadcast/components/molecules/VoiceBroadcastSmallPlaybackBody.tsx index 921e1eb17f..8a005e9f72 100644 --- a/src/voice-broadcast/components/molecules/VoiceBroadcastSmallPlaybackBody.tsx +++ b/src/voice-broadcast/components/molecules/VoiceBroadcastSmallPlaybackBody.tsx @@ -15,6 +15,7 @@ limitations under the License. */ import React from "react"; +import { Icon as XIcon } from "@vector-im/compound-design-tokens/icons/close.svg"; import { VoiceBroadcastHeader, @@ -24,7 +25,6 @@ import { } from "../.."; import AccessibleButton from "../../../components/views/elements/AccessibleButton"; import { useVoiceBroadcastPlayback } from "../../hooks/useVoiceBroadcastPlayback"; -import { Icon as XIcon } from "../../../../res/img/compound/close-8px.svg"; interface VoiceBroadcastSmallPlaybackBodyProps { playback: VoiceBroadcastPlayback;