diff --git a/.changeset/violet-roses-look.md b/.changeset/violet-roses-look.md new file mode 100644 index 00000000000..a845151cc84 --- /dev/null +++ b/.changeset/violet-roses-look.md @@ -0,0 +1,2 @@ +--- +--- diff --git a/packages/clerk-js/src/ui/components/CreateOrganization/CreateOrganizationForm.tsx b/packages/clerk-js/src/ui/components/CreateOrganization/CreateOrganizationForm.tsx index daa9ad7d683..5d5da2f863a 100644 --- a/packages/clerk-js/src/ui/components/CreateOrganization/CreateOrganizationForm.tsx +++ b/packages/clerk-js/src/ui/components/CreateOrganization/CreateOrganizationForm.tsx @@ -148,7 +148,7 @@ export const CreateOrganizationForm = withCardStateProvider((props: CreateOrgani size='md' icon={Upload} sx={t => ({ - color: t.colors.$blackAlpha400, + color: t.colors.$textTertiary, transitionDuration: t.transitionDuration.$controls, })} /> diff --git a/packages/clerk-js/src/ui/components/OrganizationList/shared.tsx b/packages/clerk-js/src/ui/components/OrganizationList/shared.tsx index 3bd6e1d920b..b930e7cd8b6 100644 --- a/packages/clerk-js/src/ui/components/OrganizationList/shared.tsx +++ b/packages/clerk-js/src/ui/components/OrganizationList/shared.tsx @@ -29,9 +29,9 @@ const sharedStyles: ThemableCssProp = t => ({ }); export const sharedMainIdentifierSx: ThemableCssProp = t => ({ - color: t.colors.$blackAlpha950, + color: t.colors.$text, ':hover': { - color: t.colors.$blackAlpha950, + color: t.colors.$text, }, }); diff --git a/packages/clerk-js/src/ui/components/OrganizationProfile/MemberListTable.tsx b/packages/clerk-js/src/ui/components/OrganizationProfile/MemberListTable.tsx index 901817a1a88..67a676d8b37 100644 --- a/packages/clerk-js/src/ui/components/OrganizationProfile/MemberListTable.tsx +++ b/packages/clerk-js/src/ui/components/OrganizationProfile/MemberListTable.tsx @@ -190,7 +190,7 @@ export const RoleSelect = (props: { sx={ triggerSx || (t => ({ - color: t.colors.$colorTextSecondary, + color: t.colors.$text, backgroundColor: 'transparent', textWrap: 'nowrap', })) @@ -205,13 +205,13 @@ export const RoleSelect = (props: { {prefixLocalizationKey && ( ({ color: t.colors.$blackAlpha400 })} + sx={t => ({ color: t.colors.$textTertiary })} localizationKey={prefixLocalizationKey} /> )} ({ color: t.colors.$blackAlpha950 })} + sx={t => ({ color: t.colors.$text })} > {localizeCustomRole(selectedRole?.value) || selectedRole?.label} diff --git a/packages/clerk-js/src/ui/components/OrganizationProfile/OrganizationGeneralPage.tsx b/packages/clerk-js/src/ui/components/OrganizationProfile/OrganizationGeneralPage.tsx index 484d9c3d34a..6c4c0b68b94 100644 --- a/packages/clerk-js/src/ui/components/OrganizationProfile/OrganizationGeneralPage.tsx +++ b/packages/clerk-js/src/ui/components/OrganizationProfile/OrganizationGeneralPage.tsx @@ -148,20 +148,20 @@ const OrganizationDomainsSection = () => { - - - ({ - paddingLeft: t.space.$9, - color: t.colors.$colorTextSecondary, - })} - /> - + + + ({ + paddingLeft: t.space.$9, + color: t.colors.$textSecondary, + })} + /> + diff --git a/packages/clerk-js/src/ui/components/OrganizationProfile/OrganizationMembersTabInvitations.tsx b/packages/clerk-js/src/ui/components/OrganizationProfile/OrganizationMembersTabInvitations.tsx index 1a206e7988b..2a3e70459da 100644 --- a/packages/clerk-js/src/ui/components/OrganizationProfile/OrganizationMembersTabInvitations.tsx +++ b/packages/clerk-js/src/ui/components/OrganizationProfile/OrganizationMembersTabInvitations.tsx @@ -65,7 +65,7 @@ export const OrganizationMembersTabInvitations = () => { )} sx={t => ({ paddingLeft: t.space.$10, - color: t.colors.$colorTextSecondary, + color: t.colors.$textSecondary, [mqu.md]: { paddingLeft: 0, }, diff --git a/packages/clerk-js/src/ui/components/OrganizationProfile/OrganizationMembersTabRequests.tsx b/packages/clerk-js/src/ui/components/OrganizationProfile/OrganizationMembersTabRequests.tsx index 4d817ce9e16..7bae94507af 100644 --- a/packages/clerk-js/src/ui/components/OrganizationProfile/OrganizationMembersTabRequests.tsx +++ b/packages/clerk-js/src/ui/components/OrganizationProfile/OrganizationMembersTabRequests.tsx @@ -65,7 +65,7 @@ export const OrganizationMembersTabRequests = () => { )} sx={t => ({ paddingLeft: t.space.$10, - color: t.colors.$colorTextSecondary, + color: t.colors.$textSecondary, [mqu.md]: { paddingLeft: 0, }, diff --git a/packages/clerk-js/src/ui/components/OrganizationProfile/OrganizationProfileAvatarUploader.tsx b/packages/clerk-js/src/ui/components/OrganizationProfile/OrganizationProfileAvatarUploader.tsx index b605be8dce4..0441b93d7d9 100644 --- a/packages/clerk-js/src/ui/components/OrganizationProfile/OrganizationProfileAvatarUploader.tsx +++ b/packages/clerk-js/src/ui/components/OrganizationProfile/OrganizationProfileAvatarUploader.tsx @@ -17,7 +17,7 @@ export const OrganizationProfileAvatarUploader = ( sx={t => ({ textAlign: 'left', marginBottom: t.space.$2, - color: t.colors.$blackAlpha700, + color: t.colors.$textSecondary, })} localizationKey={localizationKeys('organizationProfile.start.profileSection.uploadAction__title')} /> diff --git a/packages/clerk-js/src/ui/components/OrganizationSwitcher/OrganizationSwitcherPopover.tsx b/packages/clerk-js/src/ui/components/OrganizationSwitcher/OrganizationSwitcherPopover.tsx index 7059868d528..1dd0d9dc745 100644 --- a/packages/clerk-js/src/ui/components/OrganizationSwitcher/OrganizationSwitcherPopover.tsx +++ b/packages/clerk-js/src/ui/components/OrganizationSwitcher/OrganizationSwitcherPopover.tsx @@ -185,7 +185,7 @@ export const OrganizationSwitcherPopover = React.forwardRef - {manageOrganizationSmallIconButton} + {manageOrganizationSmallIconButton} ); diff --git a/packages/clerk-js/src/ui/components/OrganizationSwitcher/OrganizationSwitcherTrigger.tsx b/packages/clerk-js/src/ui/components/OrganizationSwitcher/OrganizationSwitcherTrigger.tsx index 06c1a3ceef6..7394ce6d458 100644 --- a/packages/clerk-js/src/ui/components/OrganizationSwitcher/OrganizationSwitcherTrigger.tsx +++ b/packages/clerk-js/src/ui/components/OrganizationSwitcher/OrganizationSwitcherTrigger.tsx @@ -37,7 +37,6 @@ export const OrganizationSwitcherTrigger = withAvatarShimmer( t => ({ padding: `${t.space.$1} ${t.space.$2}`, position: 'relative', - color: t.colors.$colorText, }), sx, ]} @@ -54,7 +53,7 @@ export const OrganizationSwitcherTrigger = withAvatarShimmer( size='xs' fetchRoles organization={organization} - sx={t => ({ maxWidth: '30ch', color: t.colors.$blackAlpha600 })} + sx={{ maxWidth: '30ch' }} /> )} {!organization && ( @@ -63,7 +62,7 @@ export const OrganizationSwitcherTrigger = withAvatarShimmer( gap={3} user={userWithoutIdentifiers} showAvatar={!hidePersonal} - sx={t => ({ color: t.colors.$blackAlpha600 })} + sx={t => ({ color: t.colors.$textSecondary })} title={ hidePersonal ? localizationKeys('organizationSwitcher.notSelected') @@ -77,7 +76,7 @@ export const OrganizationSwitcherTrigger = withAvatarShimmer( ({ color: t.colors.$blackAlpha400, marginLeft: `${t.space.$2}` })} + sx={t => ({ marginLeft: `${t.space.$2}` })} /> ); diff --git a/packages/clerk-js/src/ui/components/OrganizationSwitcher/OtherOrganizationActions.tsx b/packages/clerk-js/src/ui/components/OrganizationSwitcher/OtherOrganizationActions.tsx index 3cebe146409..e1189fd5c55 100644 --- a/packages/clerk-js/src/ui/components/OrganizationSwitcher/OtherOrganizationActions.tsx +++ b/packages/clerk-js/src/ui/components/OrganizationSwitcher/OtherOrganizationActions.tsx @@ -34,10 +34,10 @@ const CreateOrganizationButton = ({ onClick={onCreateOrganizationClick} sx={t => ({ borderBottom: 'none', - color: t.colors.$blackAlpha500, + color: t.colors.$textSecondary, padding: `${t.space.$5} ${t.space.$5}`, ':hover': { - color: t.colors.$blackAlpha600, + color: t.colors.$textSecondary, }, })} iconSx={t => ({ diff --git a/packages/clerk-js/src/ui/components/OrganizationSwitcher/UserInvitationSuggestionList.tsx b/packages/clerk-js/src/ui/components/OrganizationSwitcher/UserInvitationSuggestionList.tsx index f0b7eca3cb6..57bb3ce80da 100644 --- a/packages/clerk-js/src/ui/components/OrganizationSwitcher/UserInvitationSuggestionList.tsx +++ b/packages/clerk-js/src/ui/components/OrganizationSwitcher/UserInvitationSuggestionList.tsx @@ -114,9 +114,9 @@ const Preview = ( elementId='organizationSwitcherListedOrganization' organization={publicOrganizationData} sx={t => ({ - color: t.colors.$blackAlpha600, + color: t.colors.$textSecondary, ':hover': { - color: t.colors.$blackAlpha600, + color: t.colors.$textSecondary, }, })} /> @@ -177,9 +177,9 @@ const InvitationPreview = withCardStateProvider( elementId='organizationSwitcherListedOrganization' organization={publicOrganizationData} sx={t => ({ - color: t.colors.$blackAlpha600, + color: t.colors.$textSecondary, ':hover': { - color: t.colors.$blackAlpha600, + color: t.colors.$textSecondary, }, })} /> diff --git a/packages/clerk-js/src/ui/components/OrganizationSwitcher/UserMembershipList.tsx b/packages/clerk-js/src/ui/components/OrganizationSwitcher/UserMembershipList.tsx index 349db5141c9..c06b8c1d664 100644 --- a/packages/clerk-js/src/ui/components/OrganizationSwitcher/UserMembershipList.tsx +++ b/packages/clerk-js/src/ui/components/OrganizationSwitcher/UserMembershipList.tsx @@ -81,9 +81,9 @@ export const UserMembershipList = (props: UserMembershipListProps) => { mainIdentifierVariant={'buttonLarge'} title={localizationKeys('organizationSwitcher.personalWorkspace')} mainIdentifierSx={t => ({ - color: t.colors.$blackAlpha600, + color: t.colors.$textSecondary, ':hover': { - color: t.colors.$blackAlpha600, + color: t.colors.$textSecondary, }, })} /> @@ -101,9 +101,9 @@ export const UserMembershipList = (props: UserMembershipListProps) => { elementId='organizationSwitcherListedOrganization' organization={organization} sx={t => ({ - color: t.colors.$blackAlpha600, + color: t.colors.$textSecondary, ':hover': { - color: t.colors.$blackAlpha600, + color: t.colors.$textSecondary, }, })} /> diff --git a/packages/clerk-js/src/ui/components/SignIn/SignInAccountSwitcher.tsx b/packages/clerk-js/src/ui/components/SignIn/SignInAccountSwitcher.tsx index fe3e81607ea..51ea9528d84 100644 --- a/packages/clerk-js/src/ui/components/SignIn/SignInAccountSwitcher.tsx +++ b/packages/clerk-js/src/ui/components/SignIn/SignInAccountSwitcher.tsx @@ -44,7 +44,7 @@ const _SignInAccountSwitcher = () => { justifyContent: 'flex-start', borderRadius: 0, borderBottom: `${theme.borders.$normal} ${theme.colors.$blackAlpha100}`, - backgroundColor: theme.colors.$colorBackground, + backgroundColor: theme.colors.$background, })} icon={SwitchArrowRight} > @@ -68,7 +68,7 @@ const _SignInAccountSwitcher = () => { label={localizationKeys('userButton.action__addAccount')} onClick={handleAddAccountClicked} iconSx={t => ({ - color: t.colors.$blackAlpha400, + color: t.colors.$textTertiary, width: t.sizes.$9, height: t.sizes.$6, })} @@ -107,7 +107,7 @@ const _SignInAccountSwitcher = () => { onClick={handleSignOutAllClicked} variant='ghostDanger' sx={t => ({ - color: t.colors.$blackAlpha600, + color: t.colors.$textSecondary, padding: `${t.space.$2} ${t.space.$3}`, borderBottom: 'none', width: '100%', diff --git a/packages/clerk-js/src/ui/components/UserButton/SessionActions.tsx b/packages/clerk-js/src/ui/components/UserButton/SessionActions.tsx index 35ce409e777..cd4c724a93e 100644 --- a/packages/clerk-js/src/ui/components/UserButton/SessionActions.tsx +++ b/packages/clerk-js/src/ui/components/UserButton/SessionActions.tsx @@ -31,7 +31,7 @@ export const SingleSessionActions = (props: SessionActionsProps) => { onClick={handleManageAccountClicked} sx={t => ({ borderTop: `${t.borders.$normal} ${t.colors.$blackAlpha100}`, - backgroundColor: t.colors.$colorBackground, + backgroundColor: t.colors.$background, padding: `${t.space.$4} ${t.space.$5}`, })} /> @@ -51,8 +51,7 @@ export const SingleSessionActions = (props: SessionActionsProps) => { borderBottomRightRadius: t.radii.$lg, padding: `${t.space.$4} ${t.space.$5}`, ':hover': { - backgroundColor: t.colors.$dangerAlpha50, - color: t.colors.$danger400, + background: t.colors.$dangerAlpha50, }, }), ]} @@ -98,11 +97,9 @@ export const MultiSessionActions = (props: SessionActionsProps) => { icon={SignOut} label={localizationKeys('userButton.action__signOut')} onClick={handleSignOutSessionClicked(session)} + variant='secondaryDanger' sx={t => ({ - ':hover': { - backgroundColor: t.colors.$dangerAlpha50, - color: t.colors.$danger400, - }, + color: t.colors.$secondaryForeground, })} /> diff --git a/packages/clerk-js/src/ui/components/UserButton/UserButtonPopover.tsx b/packages/clerk-js/src/ui/components/UserButton/UserButtonPopover.tsx index adaf1ff0f72..7c8d3796a2c 100644 --- a/packages/clerk-js/src/ui/components/UserButton/UserButtonPopover.tsx +++ b/packages/clerk-js/src/ui/components/UserButton/UserButtonPopover.tsx @@ -38,11 +38,11 @@ export const UserButtonPopover = React.forwardRef ({ - backgroundColor: t.colors.$colorBackground, + backgroundColor: t.colors.$background, borderBottom: 'none', })} iconSx={t => ({ - color: t.colors.$blackAlpha400, + color: t.colors.$textSecondary, width: t.sizes.$9, height: t.sizes.$6, })} @@ -75,7 +75,7 @@ export const UserButtonPopover = React.forwardRef ({ - color: t.colors.$blackAlpha600, + color: t.colors.$textSecondary, padding: `${t.space.$2} ${t.space.$3}`, borderBottom: 'none', borderRadius: t.radii.$lg, @@ -94,7 +94,7 @@ export const UserButtonPopover = React.forwardRef ({ borderRadius: 0, borderBottom: `${t.borders.$normal} ${t.colors.$blackAlpha100}`, - backgroundColor: t.colors.$colorBackground, + backgroundColor: t.colors.$background, })} onClick={handleSessionClicked(session)} role='menuitem' diff --git a/packages/clerk-js/src/ui/components/UserButton/UserButtonTrigger.tsx b/packages/clerk-js/src/ui/components/UserButton/UserButtonTrigger.tsx index 40defd3dfe9..624ceb36e54 100644 --- a/packages/clerk-js/src/ui/components/UserButton/UserButtonTrigger.tsx +++ b/packages/clerk-js/src/ui/components/UserButton/UserButtonTrigger.tsx @@ -21,7 +21,7 @@ export const UserButtonTrigger = withAvatarShimmer(