Skip to content

Commit fc7dfc3

Browse files
committed
chore(clerk-js): Minor clean-up
1 parent 85e918c commit fc7dfc3

File tree

3 files changed

+19
-17
lines changed

3 files changed

+19
-17
lines changed

packages/clerk-js/src/ui/foundations/colors.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ export const colors: Colors = Object.freeze({
6868
colorTextSecondary: clerkCssVar('secondary-foreground', '#747686'),
6969
colorInputText: clerkCssVar('input-foreground', '#131316'),
7070
colorTextOnPrimaryBackground: clerkCssVar('primary-foreground', 'white'),
71-
colorShimmer: transparentize(clerkCssVar('shimmer', 'white'), '36%'),
71+
colorShimmer: clerkCssVar('shimmer', transparentize('white', '36%')),
7272
transparent: 'transparent',
7373
white: 'white',
7474
black: 'black',

packages/clerk-js/src/ui/foundations/sizes.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -69,15 +69,15 @@ const space = Object.freeze({
6969

7070
const sizes = Object.freeze({ ...space } as const);
7171

72-
const radiiDefaultVar = clerkCssVar('border-radius', '0.375rem');
72+
const radiiDefaultVar = clerkCssVar('radius', '0.375rem');
7373
const radii = Object.freeze({
7474
none: '0px',
7575
circle: '50%',
76-
avatar: clerkCssVar('border-radius-avatar', radiiDefaultVar), // 0.375rem
77-
sm: clerkCssVar('border-radius-sm', `calc(${radiiDefaultVar} * 0.666)`), // 0.25rem
78-
md: clerkCssVar('border-radius-md', radiiDefaultVar), // 0.375rem
79-
lg: clerkCssVar('border-radius-lg', `calc(${radiiDefaultVar} * 1.333)`), // 0.5rem
80-
xl: clerkCssVar('border-radius-xl', `calc(${radiiDefaultVar} * 2)`), // 0.75rem
76+
avatar: clerkCssVar('radius-avatar', radiiDefaultVar), // 0.375rem
77+
sm: clerkCssVar('radius-sm', `calc(${radiiDefaultVar} * 0.666)`), // 0.25rem
78+
md: clerkCssVar('radius-md', radiiDefaultVar), // 0.375rem
79+
lg: clerkCssVar('radius-lg', `calc(${radiiDefaultVar} * 1.333)`), // 0.5rem
80+
xl: clerkCssVar('radius-xl', `calc(${radiiDefaultVar} * 2)`), // 0.75rem
8181
halfHeight: '99999px',
8282
} as const);
8383

packages/clerk-js/src/ui/foundations/typography.ts

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,13 @@ const fontWeights = Object.freeze({
77
bold: clerkCssVar('font-weight-bold', '700'),
88
} as const);
99

10+
const lineHeightsDefaultVar = clerkCssVar('line-height', 'normal');
1011
const lineHeights = Object.freeze({
11-
normal: clerkCssVar('line-height-normal', clerkCssVar('line-height', 'normal')),
12-
extraSmall: clerkCssVar('line-height-extra-small', `calc(${clerkCssVar('line-height', 'normal')} * 1.33333)`), // 1.33333
13-
small: clerkCssVar('line-height-small', `calc(${clerkCssVar('line-height', 'normal')} * 1.38462)`), // 1.38462
14-
medium: clerkCssVar('line-height-medium', `calc(${clerkCssVar('line-height', 'normal')} * 1.41176)`), // 1.41176
15-
large: clerkCssVar('line-height-large', `calc(${clerkCssVar('line-height', 'normal')} * 1.45455)`), // 1.45455
12+
normal: clerkCssVar('line-height-normal', lineHeightsDefaultVar),
13+
extraSmall: clerkCssVar('line-height-xs', `calc(${lineHeightsDefaultVar} * 1.33333)`), // 1.33333
14+
small: clerkCssVar('line-height-sm', `calc(${lineHeightsDefaultVar} * 1.38462)`), // 1.38462
15+
medium: clerkCssVar('line-height-md', `calc(${lineHeightsDefaultVar} * 1.41176)`), // 1.41176
16+
large: clerkCssVar('line-height-lg', `calc(${lineHeightsDefaultVar} * 1.45455)`), // 1.45455
1617
} as const);
1718

1819
const letterSpacings = Object.freeze({
@@ -22,12 +23,13 @@ const letterSpacings = Object.freeze({
2223
// We want to achieve the md size to be 13px for root font size of 16px
2324
// This is directly related to the createFontSizeScale function in the theme
2425
// ref: src/ui/customizables/parseVariables.ts
26+
const fontSizesDefaultVar = clerkCssVar('font-size', '0.8125rem');
2527
const fontSizes = Object.freeze({
26-
xs: clerkCssVar('font-size-xs', `calc(${clerkCssVar('font-size', '0.8125rem')} * 0.8)`), // 0.6875rem
27-
sm: clerkCssVar('font-size-sm', `calc(${clerkCssVar('font-size', '0.8125rem')} * 0.9)`), // 0.75rem
28-
md: clerkCssVar('font-size-md', clerkCssVar('font-size', '0.8125rem')),
29-
lg: clerkCssVar('font-size-lg', `calc(${clerkCssVar('font-size', '0.8125rem')} * 1.3)`), // 1.0625rem
30-
xl: clerkCssVar('font-size-xl', `calc(${clerkCssVar('font-size', '0.8125rem')} * 1.85)`), // 1.5rem
28+
xs: clerkCssVar('font-size-xs', `calc(${fontSizesDefaultVar} * 0.8)`), // 0.6875rem
29+
sm: clerkCssVar('font-size-sm', `calc(${fontSizesDefaultVar} * 0.9)`), // 0.75rem
30+
md: clerkCssVar('font-size-md', fontSizesDefaultVar),
31+
lg: clerkCssVar('font-size-lg', `calc(${fontSizesDefaultVar} * 1.3)`), // 1.0625rem
32+
xl: clerkCssVar('font-size-xl', `calc(${fontSizesDefaultVar} * 1.85)`), // 1.5rem
3133
} as const);
3234

3335
const fontStyles = Object.freeze({

0 commit comments

Comments
 (0)