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

Standardise icons using Compound Design Tokens #28286

Merged
merged 19 commits into from
Nov 14, 2024
Merged

Conversation

t3chguy
Copy link
Member

@t3chguy t3chguy commented Oct 24, 2024

No description provided.

@t3chguy t3chguy changed the base branch from develop to t3chguy/kill-stale-code October 25, 2024 10:57
@t3chguy t3chguy changed the title Remove stale _LegacyRoomHeader.pcss and icons De-duplicate icons using Compound Design Tokens Oct 25, 2024
Base automatically changed from t3chguy/kill-stale-code to develop October 28, 2024 14:37
Signed-off-by: Michael Telatynski <[email protected]>
Signed-off-by: Michael Telatynski <[email protected]>
…to t3chguy/dedup-icons-24oct

# Conflicts:
#	res/css/views/rooms/_ThreadSummary.pcss
#	src/components/views/dialogs/AddExistingToSpaceDialog.tsx
#	src/components/views/dialogs/ModalWidgetDialog.tsx
…to t3chguy/dedup-icons-24oct

# Conflicts:
#	playwright/snapshots/register/email.spec.ts/registration-check-your-email-linux.png
#	playwright/snapshots/register/register.spec.ts/registration-linux.png
#	playwright/snapshots/register/register.spec.ts/terms-prompt-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/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/threads-activity-centre/threadsActivityCentre.spec.ts/tac-hovered-linux.png
#	res/css/views/dialogs/_AnalyticsLearnMoreDialog.pcss
#	res/css/views/elements/_Dropdown.pcss
#	res/css/views/elements/_Field.pcss
@t3chguy t3chguy added T-Enhancement and removed T-Task Tasks for the team like planning labels Nov 13, 2024
@t3chguy t3chguy changed the title De-duplicate icons using Compound Design Tokens Standardise icons using Compound Design Tokens Nov 13, 2024
Signed-off-by: Michael Telatynski <[email protected]>
Signed-off-by: Michael Telatynski <[email protected]>
Signed-off-by: Michael Telatynski <[email protected]>
@t3chguy t3chguy added this pull request to the merge queue Nov 14, 2024
Merged via the queue into develop with commit 9a12679 Nov 14, 2024
38 checks passed
@t3chguy t3chguy deleted the t3chguy/dedup-icons-24oct branch November 14, 2024 12:51
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.

2 participants