Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

De-duplicate icons using Compound Design Tokens #28217

Draft
wants to merge 19 commits into
base: develop
Choose a base branch
from

Conversation

t3chguy
Copy link
Member

@t3chguy t3chguy commented Oct 17, 2024

No description provided.

Signed-off-by: Michael Telatynski <[email protected]>
Signed-off-by: Michael Telatynski <[email protected]>
Signed-off-by: Michael Telatynski <[email protected]>
Signed-off-by: Michael Telatynski <[email protected]>
Signed-off-by: Michael Telatynski <[email protected]>
… t3chguy/dedup-icons

Signed-off-by: Michael Telatynski <[email protected]>

# Conflicts:
#	playwright/snapshots/file-upload/image-upload.spec.ts/image-upload-preview-linux.png
#	playwright/snapshots/invite/invite-dialog.spec.ts/invite-dialog-dm-with-user-pill-linux.png
#	playwright/snapshots/invite/invite-dialog.spec.ts/invite-dialog-dm-without-user-linux.png
#	playwright/snapshots/permalinks/permalinks.spec.ts/permalink-rendering-linux.png
#	playwright/snapshots/polls/polls.spec.ts/Polls-Timeline-tile-no-votes-linux.png
#	playwright/snapshots/polls/polls.spec.ts/ThreadView-with-a-poll-on-bubble-layout-linux.png
#	playwright/snapshots/polls/polls.spec.ts/ThreadView-with-a-poll-on-group-layout-linux.png
#	playwright/snapshots/release-announcement/releaseAnnouncement.spec.ts/release-announcement-Threads-Activity-Centre-linux.png
#	playwright/snapshots/right-panel/file-panel.spec.ts/file-tiles-list-linux.png
#	playwright/snapshots/room-directory/room-directory.spec.ts/filtered-no-results-linux.png
#	playwright/snapshots/room-directory/room-directory.spec.ts/filtered-one-result-linux.png
#	playwright/snapshots/room/room-header.spec.ts/encrypted-room-header-linux.png
#	playwright/snapshots/room/room-header.spec.ts/room-header-highlighted-linux.png
#	playwright/snapshots/room/room-header.spec.ts/room-header-linux.png
#	playwright/snapshots/room/room-header.spec.ts/room-header-long-name-linux.png
#	playwright/snapshots/room/room-header.spec.ts/room-header-video-room-linux.png
#	playwright/snapshots/room/room-header.spec.ts/room-header-with-apps-button-highlighted-linux.png
#	playwright/snapshots/room/room-header.spec.ts/room-header-with-apps-button-not-highlighted-linux.png
#	playwright/snapshots/settings/appearance-user-settings-tab/appearance-user-settings-tab.spec.ts/appearance-tab-linux.png
#	playwright/snapshots/settings/appearance-user-settings-tab/appearance-user-settings-tab.spec.ts/window-12px-linux.png
#	playwright/snapshots/settings/general-room-settings-tab.spec.ts/General-room-settings-tab-should-be-rendered-properly-1-linux.png
#	playwright/snapshots/settings/general-user-settings-tab.spec.ts/general-linux.png
#	playwright/snapshots/settings/general-user-settings-tab.spec.ts/general-smallscreen-linux.png
#	playwright/snapshots/settings/preferences-user-settings-tab.spec.ts/Preferences-user-settings-tab-should-be-rendered-properly-1-linux.png
#	playwright/snapshots/settings/security-user-settings-tab.spec.ts/Security-user-settings-tab-with-posthog-enable-b5d89-csLearnMoreDialog-should-be-rendered-properly-1-linux.png
#	playwright/snapshots/spaces/spaces.spec.ts/space-panel-expanded-linux.png
#	playwright/snapshots/spaces/threads-activity-centre/threadsActivityCentre.spec.ts/tac-button-expanded-linux.png
#	playwright/snapshots/spaces/threads-activity-centre/threadsActivityCentre.spec.ts/tac-hovered-expanded-linux.png
#	playwright/snapshots/threads/threads.spec.ts/Reply-to-the-location-on-ThreadView-linux.png
#	playwright/snapshots/timeline/timeline.spec.ts/collapsed-gels-and-messages-irc-layout-linux.png
#	playwright/snapshots/timeline/timeline.spec.ts/collapsed-gels-bubble-layout-linux.png
#	playwright/snapshots/timeline/timeline.spec.ts/configured-room-irc-layout-linux.png
#	playwright/snapshots/timeline/timeline.spec.ts/event-line-inline-start-margin-irc-layout-linux.png
#	playwright/snapshots/timeline/timeline.spec.ts/event-tiles-bubble-layout-linux.png
#	playwright/snapshots/timeline/timeline.spec.ts/event-tiles-compact-modern-layout-linux.png
#	playwright/snapshots/timeline/timeline.spec.ts/event-tiles-irc-layout-linux.png
#	playwright/snapshots/timeline/timeline.spec.ts/event-tiles-modern-layout-linux.png
#	playwright/snapshots/timeline/timeline.spec.ts/expanded-gels-and-messages-irc-layout-linux.png
#	playwright/snapshots/timeline/timeline.spec.ts/expanded-gels-bubble-layout-linux.png
#	playwright/snapshots/timeline/timeline.spec.ts/expanded-gels-emote-irc-layout-linux.png
#	playwright/snapshots/timeline/timeline.spec.ts/expanded-gels-irc-layout-linux.png
#	playwright/snapshots/timeline/timeline.spec.ts/expanded-gels-modern-layout-linux.png
#	playwright/snapshots/timeline/timeline.spec.ts/expanded-gels-redaction-placeholder-linux.png
#	playwright/snapshots/user-onboarding/user-onboarding-new.spec.ts/User-Onboarding-new-user-page-is-shown-and-preference-exists-1-linux.png
#	playwright/snapshots/user-view/user-view.spec.ts/user-info-linux.png
#	res/css/_common.pcss
#	res/css/structures/_SearchBox.pcss
#	res/css/structures/_UserMenu.pcss
#	res/css/views/dialogs/_UserSettingsDialog.pcss
#	res/css/views/elements/_ImageView.pcss
#	res/css/views/right_panel/_RoomSummaryCard.pcss
#	res/css/views/rooms/_PinnedEventTile.pcss
#	src/components/structures/RoomStatusBar.tsx
#	src/components/views/beacon/DialogSidebar.tsx
#	src/components/views/beacon/RoomLiveShareWarning.tsx
#	src/components/views/messages/MessageActionBar.tsx
#	src/components/views/right_panel/PinnedMessagesCard.tsx
#	src/components/views/rooms/RoomKnocksBar.tsx
#	src/components/views/settings/tabs/room/PeopleRoomSettingsTab.tsx
#	src/voice-broadcast/components/atoms/VoiceBroadcastHeader.tsx
#	src/voice-broadcast/components/molecules/VoiceBroadcastSmallPlaybackBody.tsx
… t3chguy/dedup-icons

# Conflicts:
#	res/css/views/rooms/_MessageComposerFormatBar.pcss
#	src/components/views/elements/Pill.tsx
#	src/components/views/messages/MessageActionBar.tsx
#	src/components/views/settings/tabs/user/SidebarUserSettingsTab.tsx
… t3chguy/dedup-icons

# Conflicts:
#	playwright/snapshots/audio-player/audio-player.spec.ts/Selected-EventTile-of-audio-player-with-a-reply-bubble-layout-linux.png
#	playwright/snapshots/audio-player/audio-player.spec.ts/Selected-EventTile-of-audio-player-with-a-reply-chain-bubble-layout-linux.png
#	playwright/snapshots/audio-player/audio-player.spec.ts/Selected-EventTile-of-audio-player-with-a-reply-chain-group-layout-linux.png
#	playwright/snapshots/audio-player/audio-player.spec.ts/Selected-EventTile-of-audio-player-with-a-reply-chain-irc-layout-linux.png
#	playwright/snapshots/audio-player/audio-player.spec.ts/Selected-EventTile-of-audio-player-with-a-reply-group-layout-linux.png
#	playwright/snapshots/audio-player/audio-player.spec.ts/Selected-EventTile-of-audio-player-with-a-reply-irc-layout-linux.png
Signed-off-by: Michael Telatynski <[email protected]>
…atrix-react-sdk into t3chguy/dedup-icons

# Conflicts:
#	res/css/views/dialogs/_SpotlightDialog.pcss
#	res/css/views/rooms/_ReplyPreview.pcss
#	res/css/views/rooms/_TopUnreadMessagesBar.pcss
#	res/css/views/user-onboarding/_UserOnboardingButton.pcss
#	res/css/views/user-onboarding/_UserOnboardingTask.pcss
#	src/components/views/elements/AppTile.tsx
#	src/components/views/elements/Tag.tsx
#	src/components/views/messages/MessageActionBar.tsx
#	src/components/views/rooms/LinkPreviewGroup.tsx
#	src/components/views/spaces/QuickSettingsButton.tsx
…to t3chguy/dedup-icons-17oct

# Conflicts:
#	.editorconfig
#	.eslintignore
#	.git-blame-ignore-revs
#	.github/PULL_REQUEST_TEMPLATE.md
#	.github/labels.yml
#	.github/release-drafter.yml
#	.github/workflows/backport.yml
#	.github/workflows/release-gitflow.yml
#	.github/workflows/release.yml
#	.github/workflows/static_analysis.yaml
#	.gitignore
#	.lintstagedrc
#	.npmignore
#	.prettierignore
#	CHANGELOG.md
#	CONTRIBUTING.md
#	LICENSE-AGPL-3.0
#	README.md
#	babel.config.js
#	docs/SUMMARY.md
#	docs/jitsi.md
#	jest.config.ts
#	localazy.json
#	package.json
#	playwright/snapshots/forgot-password/forgot-password.spec.ts/forgot-password-linux.png
#	playwright/snapshots/spaces/spaces.spec.ts/space-panel-collapsed-linux.png
#	release_config.yaml
#	res/css/structures/_RoomSearch.pcss
#	res/fonts/Open_Sans/LICENSE.txt
#	res/jitsi_external_api.min.js.LICENSE.txt
#	sonar-project.properties
#	src/@types/global.d.ts
#	src/async-components/views/dialogs/security/CreateSecretStorageDialog.tsx
#	src/components/structures/AutocompleteInput.tsx
#	src/components/structures/ErrorMessage.tsx
#	src/components/structures/auth/ForgotPassword.tsx
#	src/components/structures/auth/forgot-password/EnterEmail.tsx
#	src/components/views/elements/AppPermission.tsx
#	src/components/views/elements/AppTile.tsx
#	src/components/views/messages/DecryptionFailureBody.tsx
#	src/components/views/messages/MessageActionBar.tsx
#	src/components/views/rooms/EntityTile.tsx
#	src/components/views/spaces/QuickSettingsButton.tsx
#	src/voice-broadcast/components/atoms/VoiceBroadcastError.tsx
#	src/voice-broadcast/components/atoms/VoiceBroadcastRecordingConnectionError.tsx
#	tsconfig.json
#	yarn.lock
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant