Skip to content

Commit 56d30c4

Browse files
authored
feat(clerk-js): Add rethemed button variant and colorSchemes (#2241)
1 parent 2d383e4 commit 56d30c4

25 files changed

+101
-97
lines changed

.changeset/blue-garlics-remain.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
---
2+
---

packages/clerk-js/src/ui.retheme/components/CreateOrganization/CreateOrganizationForm.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ export const CreateOrganizationForm = (props: CreateOrganizationFormProps) => {
125125
avatarPreviewPlaceholder={
126126
<IconButton
127127
variant='ghost'
128-
colorScheme='neutral'
128+
colorScheme='secondary'
129129
aria-label='Upload organization logo'
130130
icon={
131131
<Icon

packages/clerk-js/src/ui.retheme/components/OrganizationList/OrganizationListPage.tsx

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -205,9 +205,8 @@ const OrganizationListPageList = (props: { onCreateOrganizationClick: () => void
205205
<Button
206206
elementDescriptor={descriptors.button}
207207
block
208-
colorScheme='neutral'
209-
// size='sm'
210-
variant='outline'
208+
variant='secondary'
209+
colorScheme='secondary'
211210
textVariant='buttonExtraSmallBold'
212211
onClick={handleCreateOrganizationClicked}
213212
localizationKey={localizationKeys('organizationList.action__createOrganization')}

packages/clerk-js/src/ui.retheme/components/OrganizationList/shared.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ export const PreviewListItemButton = (props: Parameters<typeof Button>[0]) => {
9898
elementDescriptor={descriptors.organizationListPreviewItemActionButton}
9999
textVariant='buttonExtraSmallBold'
100100
variant='outline'
101-
colorScheme='neutral'
101+
colorScheme='secondary'
102102
size='sm'
103103
{...props}
104104
/>

packages/clerk-js/src/ui.retheme/components/OrganizationProfile/DomainList.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ export const DomainList = withGate(
157157
<ArrowBlockButton
158158
key={d.id}
159159
variant='ghost'
160-
colorScheme='neutral'
160+
colorScheme='secondary'
161161
badge={!verificationStatus ? <EnrollmentBadge organizationDomain={d} /> : undefined}
162162
sx={t => ({
163163
padding: `${t.space.$3} ${t.space.$4}`,

packages/clerk-js/src/ui.retheme/components/OrganizationSwitcher/OrganizationSwitcherTrigger.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ export const OrganizationSwitcherTrigger = withAvatarShimmer(
3131
<Button
3232
elementDescriptor={descriptors.organizationSwitcherTrigger}
3333
variant='ghost'
34-
colorScheme='neutral'
34+
colorScheme='secondary'
3535
sx={[t => ({ minHeight: 0, padding: `0 ${t.space.$2} 0 0`, position: 'relative' }), sx]}
3636
ref={ref}
3737
aria-label={`${props.isOpen ? 'Close' : 'Open'} organization switcher`}

packages/clerk-js/src/ui.retheme/components/OrganizationSwitcher/UserInvitationSuggestionList.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,8 @@ const AcceptRejectSuggestionButtons = (props: OrganizationSuggestionResource) =>
6262
<Button
6363
elementDescriptor={descriptors.organizationSwitcherInvitationAcceptButton}
6464
textVariant='buttonExtraSmallBold'
65-
variant='outline'
66-
colorScheme='neutral'
65+
variant='secondary'
66+
colorScheme='secondary'
6767
size='sm'
6868
isLoading={card.isLoading}
6969
onClick={handleAccept}

packages/clerk-js/src/ui.retheme/components/UserButton/UserButtonPopover.tsx

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ export const UserButtonPopover = React.forwardRef<HTMLDivElement, UserButtonPopo
4242
sx={t => ({
4343
borderBottomLeftRadius: t.radii.$lg,
4444
borderBottomRightRadius: t.radii.$lg,
45+
backgroundColor: t.colors.$colorBackground,
4546
})}
4647
/>
4748
);
@@ -67,20 +68,11 @@ export const UserButtonPopover = React.forwardRef<HTMLDivElement, UserButtonPopo
6768
icon={SignOut}
6869
label={localizationKeys('userButton.action__signOutAll')}
6970
onClick={handleSignOutAllClicked}
71+
colorScheme='danger'
7072
sx={t => ({
7173
padding: `${t.space.$2} ${t.space.$3}`,
72-
backgroundColor: t.colors.$transparent,
7374
borderBottom: 'none',
7475
borderRadius: t.radii.$lg,
75-
':hover': {
76-
backgroundColor: t.colors.$danger50,
77-
},
78-
':hover .cl-userButtonPopoverActionButtonText__signOutAll': {
79-
color: t.colors.$danger400,
80-
},
81-
':hover .cl-userButtonPopoverActionButtonIcon__signOutAll': {
82-
color: t.colors.$danger400,
83-
},
8476
})}
8577
/>
8678
</Actions>

packages/clerk-js/src/ui.retheme/components/UserProfile/MfaBackupCodeCreatePage.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,6 @@ export const MfaBackupCodeCreatePage = withCardStateProvider(() => {
6161

6262
<FormButtonContainer>
6363
<NavigateToFlowStartButton
64-
variant='solid'
6564
autoFocus
6665
localizationKey={localizationKeys('userProfile.formButtonPrimary__finish')}
6766
elementDescriptor={descriptors.formButtonPrimary}

packages/clerk-js/src/ui.retheme/elements/Accordion.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ export const AccordionItem = (props: AccordionItemProps) => {
6262
<ArrowBlockButton
6363
elementDescriptor={descriptors.accordionTriggerButton}
6464
variant='ghost'
65-
colorScheme='neutral'
65+
colorScheme='secondary'
6666
textVariant='smallRegular'
6767
leftIcon={icon}
6868
rightIcon={Caret}

0 commit comments

Comments
 (0)