Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions packages/clerk-js/sandbox/app.ts
Original file line number Diff line number Diff line change
Expand Up @@ -156,16 +156,17 @@ function appearanceVariableOptions() {
'colorPrimary',
'colorNeutral',
'colorBackground',
'colorTextOnPrimaryBackground',
'colorPrimaryForeground',
'colorForeground',
'colorDanger',
'colorSuccess',
'colorWarning',
'colorText',
'colorTextSecondary',
'colorInputText',
'colorInputBackground',
'colorForeground',
'colorMutedForeground',
'colorInputForeground',
'colorInput',
'colorShimmer',
'spacingUnit',
'spacing',
'borderRadius',
] as const;

Expand Down
24 changes: 12 additions & 12 deletions packages/clerk-js/sandbox/template.html
Original file line number Diff line number Diff line change
Expand Up @@ -216,11 +216,11 @@
/>
</label>
<label class="flex items-center justify-between border-t border-gray-100 py-2">
<span class="font-mono text-xs">colorTextOnPrimaryBackground</span>
<span class="font-mono text-xs">colorPrimaryForeground</span>
<input
class="border border-gray-200"
type="color"
id="colorTextOnPrimaryBackground"
id="colorPrimaryForeground"
value="#ffffff"
/>
</label>
Expand Down Expand Up @@ -252,38 +252,38 @@
/>
</label>
<label class="flex items-center justify-between border-t border-gray-100 py-2">
<span class="font-mono text-xs">colorText</span>
<span class="font-mono text-xs">colorForeground</span>
<input
class="border border-gray-200"
type="color"
id="colorText"
id="colorForeground"
value="#212126"
/>
</label>
<label class="flex items-center justify-between border-t border-gray-100 py-2">
<span class="font-mono text-xs">colorTextSecondary</span>
<span class="font-mono text-xs">colorMutedForeground</span>
<input
class="border border-gray-200"
type="color"
id="colorTextSecondary"
id="colorMutedForeground"
value="#747686"
/>
</label>
<label class="flex items-center justify-between border-t border-gray-100 py-2">
<span class="font-mono text-xs">colorInputText</span>
<span class="font-mono text-xs">colorInputForeground</span>
<input
class="border border-gray-200"
type="color"
id="colorInputText"
id="colorInputForeground"
value="#000000"
/>
</label>
<label class="flex items-center justify-between border-t border-gray-100 py-2">
<span class="font-mono text-xs">colorInputBackground</span>
<span class="font-mono text-xs">colorInput</span>
<input
class="border border-gray-200"
type="color"
id="colorInputBackground"
id="colorInput"
value="#ffffff"
/>
</label>
Expand All @@ -297,10 +297,10 @@
/>
</label>
<label class="flex items-center justify-between border-t border-gray-100 py-2">
<span class="font-mono text-xs">spacingUnit</span>
<span class="font-mono text-xs">spacing</span>
<input
type="text"
id="spacingUnit"
id="spacing"
value="1rem"
class="text-sm outline-none [field-sizing:content]"
/>
Expand Down
2 changes: 1 addition & 1 deletion packages/clerk-js/src/ui/common/ProviderInitialIcon.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ export const ProviderInitialIcon = (props: ProviderInitialIconProps) => {
width: t.space.$4,
height: t.space.$4,
borderRadius: t.radii.$sm,
color: t.colors.$colorTextOnPrimaryBackground,
color: t.colors.$colorPrimaryForeground,
backgroundColor: t.colors.$primary500,
})}
{...rest}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ const SecretInputWithToggle = ({ apiKeyID }: { apiKeyID: string }) => {
>
<Icon
icon={revealed ? EyeSlash : Eye}
sx={t => ({ color: t.colors.$colorTextSecondary })}
sx={t => ({ color: t.colors.$colorMutedForeground })}
/>
</Button>
</Flex>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ const ExpirationSelector: React.FC<ExpirationSelectorProps> = ({ selectedExpirat
<SelectOptionList
sx={t => ({
paddingBlock: t.space.$1,
color: t.colors.$colorText,
color: t.colors.$colorForeground,
})}
/>
</Select>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,7 @@ export const CheckoutComplete = () => {
borderRadius: t.radii.$circle,
backgroundImage: `linear-gradient(180deg, rgba(255, 255, 255, 0.30) 0%, rgba(0, 0, 0, 0.12) 50%, rgba(0, 0, 0, 0.30) 95.31%)`,
boxShadow: '0px 4px 12px 0px rgba(0, 0, 0, 0.35), 0px 1px 0px 0px rgba(255, 255, 255, 0.05) inset',
color: canHover ? t.colors.$success500 : t.colors.$colorText,
color: canHover ? t.colors.$success500 : t.colors.$colorForeground,
':before': {
content: '""',
position: 'absolute',
Expand Down Expand Up @@ -319,7 +319,7 @@ export const CheckoutComplete = () => {
animationDuration: `${transitionDurationValues.slowest}ms`,
animationTimingFunction: transitionTiming.bezier,
animationFillMode: 'forwards',
color: t.colors.$colorText,
color: t.colors.$colorForeground,
'@keyframes slideUp': {
'0%': {
transform: 'translateY(30px)',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -383,7 +383,7 @@ const ExistingPaymentSourceForm = withCardStateProvider(
<SelectOptionList
sx={t => ({
paddingBlock: t.space.$1,
color: t.colors.$colorText,
color: t.colors.$colorForeground,
})}
/>
</Select>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ export const CreateOrganizationForm = withCardStateProvider((props: CreateOrgani
size='md'
icon={Upload}
sx={t => ({
color: t.colors.$colorTextSecondary,
color: t.colors.$colorMutedForeground,
transitionDuration: t.transitionDuration.$controls,
})}
/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ export function OAuthConsentInternal() {
display: 'inline-block',
width: t.space.$1,
height: t.space.$1,
background: t.colors.$colorTextSecondary,
background: t.colors.$colorMutedForeground,
borderRadius: t.radii.$circle,
transform: 'translateY(-0.1875rem)',
marginRight: t.space.$2,
Expand Down Expand Up @@ -369,7 +369,7 @@ function ConnectionSeparator() {
height={2}
aria-hidden
sx={t => ({
color: t.colors.$colorTextSecondary,
color: t.colors.$colorMutedForeground,
})}
>
<path
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,9 @@ const sharedStyles: ThemableCssProp = t => ({
});

export const sharedMainIdentifierSx: ThemableCssProp = t => ({
color: t.colors.$colorText,
color: t.colors.$colorForeground,
':hover': {
color: t.colors.$colorText,
color: t.colors.$colorForeground,
},
});

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,7 @@ export const RoleSelect = (props: {
sx={
triggerSx ||
(t => ({
color: t.colors.$colorText,
color: t.colors.$colorForeground,
backgroundColor: 'transparent',
textWrap: 'nowrap',
}))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ const OrganizationBillingPageInternal = withCardStateProvider(() => {
return (
<Col
elementDescriptor={descriptors.page}
sx={t => ({ gap: t.space.$8, color: t.colors.$colorText })}
sx={t => ({ gap: t.space.$8, color: t.colors.$colorForeground })}
>
<Col
elementDescriptor={descriptors.profilePage}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ export const OrganizationMembersTabInvitations = withCardStateProvider(() => {
)}
sx={t => ({
paddingLeft: t.space.$10,
color: t.colors.$colorTextSecondary,
color: t.colors.$colorMutedForeground,
[mqu.md]: {
paddingLeft: 0,
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ export const OrganizationMembersTabRequests = () => {
)}
sx={t => ({
paddingLeft: t.space.$10,
color: t.colors.$colorTextSecondary,
color: t.colors.$colorMutedForeground,
[mqu.md]: {
paddingLeft: 0,
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ export const OrganizationSwitcherTrigger = withAvatarShimmer(
gap={3}
user={userWithoutIdentifiers}
showAvatar={!hidePersonal}
sx={t => ({ color: t.colors.$colorTextSecondary })}
sx={t => ({ color: t.colors.$colorMutedForeground })}
title={
hidePersonal
? localizationKeys('organizationSwitcher.notSelected')
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -120,9 +120,9 @@ const Preview = (
elementId='organizationSwitcherListedOrganization'
organization={publicOrganizationData}
sx={t => ({
color: t.colors.$colorTextSecondary,
color: t.colors.$colorMutedForeground,
':hover': {
color: t.colors.$colorTextSecondary,
color: t.colors.$colorMutedForeground,
},
})}
/>
Expand Down Expand Up @@ -186,9 +186,9 @@ const InvitationPreview = withCardStateProvider(
elementId='organizationSwitcherListedOrganization'
organization={publicOrganizationData}
sx={t => ({
color: t.colors.$colorTextSecondary,
color: t.colors.$colorMutedForeground,
':hover': {
color: t.colors.$colorTextSecondary,
color: t.colors.$colorMutedForeground,
},
})}
/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ export const PaymentAttemptPage = () => {
display: 'flex',
alignItems: 'center',
gap: t.space.$0x25,
color: t.colors.$colorTextSecondary,
color: t.colors.$colorMutedForeground,
})}
>
<CopyButton
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,9 @@ const useStripeAppearance = (node: HTMLElement | null) => {
const { colors, fontWeights, fontSizes, radii, space } = theme;
return {
colorPrimary: resolveComputedCSSColor(node, colors.$primary500, colors.$colorBackground),
colorBackground: resolveComputedCSSColor(node, colors.$colorInputBackground, colors.$colorBackground),
colorText: resolveComputedCSSColor(node, colors.$colorText, colors.$colorBackground),
colorTextSecondary: resolveComputedCSSColor(node, colors.$colorTextSecondary, colors.$colorBackground),
colorBackground: resolveComputedCSSColor(node, colors.$colorInput, colors.$colorBackground),
colorText: resolveComputedCSSColor(node, colors.$colorForeground, colors.$colorBackground),
colorTextSecondary: resolveComputedCSSColor(node, colors.$colorMutedForeground, colors.$colorBackground),
colorSuccess: resolveComputedCSSColor(node, colors.$success500, colors.$colorBackground),
colorDanger: resolveComputedCSSColor(node, colors.$danger500, colors.$colorBackground),
colorWarning: resolveComputedCSSColor(node, colors.$warning500, colors.$colorBackground),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,14 @@ export const PaymentSourceRow = ({ paymentSource }: { paymentSource: CommercePay
elementDescriptor={descriptors.paymentSourceRowIcon}
/>
<Text
sx={t => ({ color: t.colors.$colorText, textTransform: 'capitalize' })}
sx={t => ({ color: t.colors.$colorForeground, textTransform: 'capitalize' })}
truncate
elementDescriptor={descriptors.paymentSourceRowType}
>
{paymentSource.paymentMethod === 'card' ? paymentSource.cardType : paymentSource.paymentMethod}
</Text>
<Text
sx={t => ({ color: t.colors.$colorTextSecondary })}
sx={t => ({ color: t.colors.$colorMutedForeground })}
variant='caption'
truncate
elementDescriptor={descriptors.paymentSourceRowValue}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import * as React from 'react';

import { Switch } from '@/ui/elements/Switch';
import { Tooltip } from '@/ui/elements/Tooltip';
import { colors } from '@/ui/utils/colors';
import { getClosestProfileScrollBox } from '@/ui/utils/getClosestProfileScrollBox';

import { useProtect } from '../../common';
Expand Down Expand Up @@ -168,10 +167,7 @@ function Card(props: CardProps) {
gap: 0,
gridTemplateRows: 'subgrid',
gridRow: 'span 5',
background: common.mergedColorsBackground(
colors.setAlpha(t.colors.$colorBackground, 1),
t.colors.$neutralAlpha50,
),
background: common.mutedBackground(t),
borderWidth: t.borderWidths.$normal,
borderStyle: t.borderStyles.$solid,
borderColor: t.colors.$neutralAlpha100,
Expand Down
4 changes: 2 additions & 2 deletions packages/clerk-js/src/ui/components/Statements/Statement.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ function Header({ title, id, status }: { title: string | LocalizationKey; id: st
display: 'flex',
alignItems: 'center',
gap: t.space.$0x25,
color: t.colors.$colorTextSecondary,
color: t.colors.$colorMutedForeground,
})}
>
<CopyButton
Expand Down Expand Up @@ -329,7 +329,7 @@ function SectionContentDetailsListItem({
display: 'flex',
alignItems: 'center',
gap: t.space.$0x25,
color: t.colors.$colorTextSecondary,
color: t.colors.$colorMutedForeground,
})}
>
{typeof value === 'string' ? (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ export function SubscriptionsList({
{(subscription.plan.amount > 0 || subscription.plan.annualAmount > 0) && (
<Span
sx={t => ({
color: t.colors.$colorTextSecondary,
color: t.colors.$colorMutedForeground,
textTransform: 'lowercase',
':before': {
content: '"/"',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ export const UserButtonTrigger = withAvatarShimmer(
<Button
elementDescriptor={descriptors.userButtonTrigger}
variant='roundWrapper'
sx={[t => ({ borderRadius: showName ? t.radii.$md : t.radii.$circle, color: t.colors.$colorText }), sx]}
sx={[t => ({ borderRadius: showName ? t.radii.$md : t.radii.$circle, color: t.colors.$colorForeground }), sx]}
ref={ref}
aria-label={`${props.isOpen ? 'Close' : 'Open'} user button`}
aria-expanded={props.isOpen}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ export const AccountPage = withCardStateProvider(() => {
return (
<Col
elementDescriptor={descriptors.page}
sx={t => ({ gap: t.space.$8, color: t.colors.$colorText })}
sx={t => ({ gap: t.space.$8, color: t.colors.$colorForeground })}
>
<Col
elementDescriptor={descriptors.profilePage}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ const BillingPageInternal = withCardStateProvider(() => {
return (
<Col
elementDescriptor={descriptors.page}
sx={t => ({ gap: t.space.$8, color: t.colors.$colorText })}
sx={t => ({ gap: t.space.$8, color: t.colors.$colorForeground })}
>
<Col
elementDescriptor={descriptors.profilePage}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ const ConnectedAccount = ({ account }: { account: ExternalAccountResource }) =>
gap={1}
center
>
<Text sx={t => ({ color: t.colors.$colorText })}>{`${
<Text sx={t => ({ color: t.colors.$colorForeground })}>{`${
providerToDisplayData[account.provider].name
}`}</Text>
<Text
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ export const EmailsSection = ({ shouldAllowCreation = true }) => {
<ProfileSection.Item id='emailAddresses'>
<Flex sx={t => ({ overflow: 'hidden', gap: t.space.$1 })}>
<Text
sx={t => ({ color: t.colors.$colorText })}
sx={t => ({ color: t.colors.$colorForeground })}
truncate
>
{email.emailAddress}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ export const PhoneSection = ({ shouldAllowCreation = true }: { shouldAllowCreati
gap={2}
center
>
<Text sx={t => ({ color: t.colors.$colorText })}>
<Text sx={t => ({ color: t.colors.$colorForeground })}>
{stringToFormattedPhoneString(phone.phoneNumber)}
</Text>
{user?.primaryPhoneNumberId === phoneId && (
Expand Down
Loading