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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 DownExpand 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 DownExpand 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 DownExpand 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 DownExpand 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 DownExpand 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 numberDiff line numberDiff 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 DownExpand 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 DownExpand 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 DownExpand 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 DownExpand 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 DownExpand 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 DownExpand 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 numberDiff line numberDiff 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 DownExpand 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 DownExpand 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 DownExpand 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 DownExpand 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 DownExpand 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 DownExpand 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 numberDiff line numberDiff 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 DownExpand 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 DownExpand 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 DownExpand 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 DownExpand 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 DownExpand 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 DownExpand 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 numberDiff line numberDiff 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 DownExpand 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 DownExpand 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 DownExpand 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 DownExpand 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 DownExpand 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 DownExpand 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 numberDiff line numberDiff 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 DownExpand 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 DownExpand 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 DownExpand 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 DownExpand 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 DownExpand 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 DownExpand 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 numberDiff line numberDiff 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 DownExpand 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 DownExpand 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 DownExpand 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 DownExpand 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 DownExpand 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 DownExpand 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 numberDiff line numberDiff 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 DownExpand 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 DownExpand 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 DownExpand 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 DownExpand 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 DownExpand 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 DownExpand 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 numberDiff line numberDiff 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 DownExpand 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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