@a-type/ui 1.6.5 → 1.7.1

package/dist/esm/uno.preset.js

@@ -14,11 +14,14 @@ const roundedScaling = {
 export default function presetAglio({ scale = 'md', interFontLocation = 'https://resources.biscuits.club/fonts/Inter-VariableFont_slnt,wght.ttf', colorRanges = {
     light: [90, 40],
     dark: [0, 60],
-}, borderScale = 1, roundedness = 1, } = {}) {
+}, borderScale = 1, roundedness = 1, saturation = 20, } = {}) {
+    const saturationPercent = saturation / 100;
     const spacingIncrement = spacing[scale];
     roundedness *= roundedScaling[scale];
     const lightColors = generateColors(...colorRanges.light);
     const darkColors = generateColors(...colorRanges.dark);
+    const darkModeSaturationTweak = 1;
+    const lightModeSaturationTweak = 3;
     return {
         name: 'atype',
         enforce: 'post',
@@ -30,18 +33,33 @@ export default function presetAglio({ scale = 'md', interFontLocation = 'https:/
                 wash: 'var(--color-wash)',
                 attentionLight: 'var(--color-attention-light)',
                 'attention-light': 'var(--color-attention-light)',
-                attention: 'var(--color-attention)',
                 attentionDark: 'var(--color-attention-dark)',
                 'attention-dark': 'var(--color-attention-dark)',
                 'attention-wash': 'var(--color-attention-wash)',
-                accent: 'var(--color-accent)',
+                attention: {
+                    DEFAULT: 'var(--color-attention)',
+                    light: 'var(--color-attention-light)',
+                    dark: 'var(--color-attention-dark)',
+                    wash: 'var(--color-attention-wash)',
+                },
+                accent: {
+                    DEFAULT: 'var(--color-accent)',
+                    light: 'var(--color-accent-light)',
+                    dark: 'var(--color-accent-dark)',
+                    wash: 'var(--color-accent-wash)',
+                },
                 accentWash: 'var(--color-accent-wash)',
                 'accent-wash': 'var(--color-accent-wash)',
                 accentLight: 'var(--color-accent-light)',
                 'accent-light': 'var(--color-accent-light)',
                 accentDark: 'var(--color-accent-dark)',
                 'accent-dark': 'var(--color-accent-dark)',
-                primary: 'var(--color-primary)',
+                primary: {
+                    DEFAULT: 'var(--color-primary)',
+                    light: 'var(--color-primary-light)',
+                    dark: 'var(--color-primary-dark)',
+                    wash: 'var(--color-primary-wash)',
+                },
                 primaryLight: 'var(--color-primary-light)',
                 'primary-light': 'var(--color-primary-light)',
                 primaryDark: 'var(--color-primary-dark)',
@@ -49,16 +67,11 @@ export default function presetAglio({ scale = 'md', interFontLocation = 'https:/
                 primaryWash: 'var(--color-primary-wash)',
                 'primary-wash': 'var(--color-primary-wash)',
                 gray: {
-                    1: 'var(--color-gray-1)',
-                    2: 'var(--color-gray-2)',
-                    3: 'var(--color-gray-3)',
-                    4: 'var(--color-gray-4)',
-                    5: 'var(--color-gray-5)',
-                    6: 'var(--color-gray-6)',
-                    7: 'var(--color-gray-7)',
-                    8: 'var(--color-gray-8)',
-                    9: 'var(--color-gray-9)',
-                    0: 'var(--color-gray-0)',
+                    DEFAULT: 'var(--color-gray)',
+                    wash: 'var(--color-gray-wash)',
+                    light: 'var(--color-gray-light)',
+                    dark: 'var(--color-gray-dark)',
+                    blend: 'var(--color-gray-blend)',
                 },
                 grayBlend: 'var(--color-gray-blend)',
                 'gray-blend': 'var(--color-gray-blend)',
@@ -356,6 +369,71 @@ export default function presetAglio({ scale = 'md', interFontLocation = 'https:/
                     'box-shadow': '0 20px 25px -5px var(--color-shadow-1), 0 10px 10px -5px var(--color-shadow-2)',
                 },
             ],
+            [
+                /^color-(.*)$/,
+                (match, { theme }) => ({
+                    color: 'var(--v-color-altered,var(--v-color))',
+                    '--v-color': resolveThemeColor(match[1], theme),
+                }),
+            ],
+            [
+                /^color-lighten-(\d+\.?\d*)$/,
+                (match, { theme }) => ({
+                    '--v-color-altered': lighten('var(--v-color,currentColor)', match[1]),
+                }),
+            ],
+            [
+                /^color-darken-(\d+\.?\d*)$/,
+                (match, { theme }) => ({
+                    '--v-color-altered': darken('var(--v-color,currentColor)', match[1]),
+                }),
+            ],
+            [
+                /^bg-(.*)$/,
+                (match, { theme }) => {
+                    return {
+                        'background-color': 'var(--v-bg-altered,var(--v-bg))',
+                        ['--v-bg']: resolveThemeColor(match[1], theme),
+                    };
+                },
+            ],
+            [
+                /^bg-lighten-(\d+\.?\d*)$/,
+                (match, { theme }) => ({
+                    '--v-bg-altered': lighten('var(--v-bg,var(--color-white))', match[1]),
+                }),
+            ],
+            [
+                /^bg-darken-(\d+\.?\d*)$/,
+                (match, { theme }) => ({
+                    '--v-bg-altered': darken('var(--v-bg,var(--color-white))', match[1]),
+                }),
+            ],
+            [
+                /^border-color-(.*)$/,
+                (match, { theme }) => ({
+                    'border-color': 'var(--v-border-altered,var(--v-border))',
+                    '--v-border': resolveThemeColor(match[1], theme),
+                }),
+            ],
+            [
+                /^border-color-lighten-(\d+\.?\d*)$/,
+                (match, { theme }) => ({
+                    '--v-border-altered': lighten('var(--v-border,currentColor)', match[1]),
+                }),
+            ],
+            [
+                /^border-color-darken-(\d+\.?\d*)$/,
+                (match, { theme }) => ({
+                    '--v-border-altered': darken('var(--v-border,currentColor)', match[1]),
+                }),
+            ],
+            [
+                /^ring-bg$/,
+                () => ({
+                    '--un-ring-color': 'var(--v-bg-altered,var(--v-bg))',
+                }),
+            ],
         ],
         variants: [
             /** Selects &+&, good for top borders */
@@ -408,46 +486,46 @@ export default function presetAglio({ scale = 'md', interFontLocation = 'https:/
 				@layer preflightBase, components, responsive, variants, utilities;
 
 				:root {
-					--palette-red-90: #ffede7;
+					--palette-red-90: #fff4f0;
 					--palette-red-80: #ffdbcf;
-					--palette-red-70: #ffb59b;
-					--palette-red-60: #ff8c60;
-					--palette-red-50: #e66d3d;
-					--palette-red-40: #be613d;
-					--palette-red-30: #9e4f2b;
-					--palette-red-20: #854121;
-					--palette-red-10: #743c22;
+					--palette-red-70: #ffbea6;
+					--palette-red-60: #fdad8e;
+					--palette-red-50: #ff8e61;
+					--palette-red-40: #d56f46;
+					--palette-red-30: #ae562d;
+					--palette-red-20: #804020;
+					--palette-red-10: #702604;
 					--palette-red-00: #321f19;
-					--palette-green-90: #e9fff1;
-					--palette-green-80: #c2ffe1;
+					--palette-green-90: #f0fff5;
+					--palette-green-80: #c2ffe9;
 					--palette-green-70: #92f2d1;
 					--palette-green-60: #86efc8;
 					--palette-green-50: #63cea5;
 					--palette-green-40: #499d92;
 					--palette-green-30: #1f837c;
 					--palette-green-20: #246869;
-					--palette-green-10: #274e48;
-					--palette-green-00: #183527;
-					--palette-yellow-90: #fff9ef;
+					--palette-green-10: #274e50;
+					--palette-green-00: #18352e;
+					--palette-yellow-90: #fff9ea;
 					--palette-yellow-80: #fff1c7;
-					--palette-yellow-70: #ffe17c;
-					--palette-yellow-60: #f7d352;
-					--palette-yellow-50: #c9a829;
+					--palette-yellow-70: #ffdf7c;
+					--palette-yellow-60: #ffdb57;
+					--palette-yellow-50: #e1b83c;
 					--palette-yellow-40: #ac7c04;
 					--palette-yellow-30: #8e5c00;
 					--palette-yellow-20: #714d00;
 					--palette-yellow-10: #634500;
 					--palette-yellow-00: #3b1c00;
-					--palette-blue-90: #e3f3ff;
+					--palette-blue-90: #eef8fe;
 					--palette-blue-80: #c4e7ff;
 					--palette-blue-70: #87d3fc;
-					--palette-blue-60: #6ad2ff;
+					--palette-blue-60: #5fcefe;
 					--palette-blue-50: #1ebcf5;
 					--palette-blue-40: #0ca6df;
 					--palette-blue-30: #077da7;
 					--palette-blue-20: #005979;
 					--palette-blue-10: #004c69;
-					--palette-blue-00: #00354a;
+					--palette-blue-00: #092c3a;
 					--palette-purple-90: #f1efff;
 					--palette-purple-80: #e0e0ff;
 					--palette-purple-70: #c8cdff;
@@ -456,8 +534,8 @@ export default function presetAglio({ scale = 'md', interFontLocation = 'https:/
 					--palette-purple-40: #6d78d7;
 					--palette-purple-30: #6068c0;
 					--palette-purple-20: #5a62a7;
-					--palette-purple-10: #4f5697;
-					--palette-purple-00: #2c2f5e;
+					--palette-purple-10: #464d8a;
+					--palette-purple-00: #272a39;
 					--palette-light-blend: rgba(255, 255, 255, 0.8);
 					--palette-dark-blend: rgba(0, 0, 0, 0.65);
 					--palette-black: #303030;
@@ -487,6 +565,11 @@ export default function presetAglio({ scale = 'md', interFontLocation = 'https:/
 					--palette-white-overlay: rgba(255, 255, 255, 0.4);
 					--palette-black-overlay: rgba(0, 0, 0, 0.4);
 
+					--color-gray-wash: hsl(from var(--color-primary-wash) calc(h + var(--wash-hue-tweak, 0)) calc(s * ${Math.min(1, saturationPercent)} * var(--wash-saturation-tweak, 1)) calc(l * pow(1.025, var(--mode-mult,1))));
+					--color-gray: hsl(from var(--color-primary) h calc(s * ${saturationPercent}) calc(l * 1.125));
+					--color-gray-dark: hsl(from var(--color-primary-dark) h calc(s * ${saturationPercent * 0.75}) calc(l * pow(1.125, var(--mode-mult,1))));
+					--color-gray-light: hsl(from var(--color-primary-light) h calc(s * ${saturationPercent * 0.5}) calc(l * pow(1.05, var(--mode-mult,1))));
+					--color-wash: var(--color-gray-wash);
 
 					--z-nowPlaying: 40;
 					--z-nav: 50;
@@ -500,12 +583,13 @@ export default function presetAglio({ scale = 'md', interFontLocation = 'https:/
 
 				/* LIGHT THEME */
 				html {
+					--wash-saturation-tweak: ${lightModeSaturationTweak};
+
 					${lightColors}
 					--color-dark-blend: var(--palette-dark-blend);
 					--color-light-blend: var(--palette-light-blend);
 					--color-black: var(--palette-black);
 					--color-white: var(--palette-white);
-					--color-wash: var(--palette-light);
 					--color-gray-1: var(--palette-gray-1);
 					--color-gray-2: var(--palette-gray-2);
 					--color-gray-3: var(--palette-gray-3);
@@ -536,17 +620,19 @@ export default function presetAglio({ scale = 'md', interFontLocation = 'https:/
 					--color-primary-light: var(--color-yellow-light);
 					--color-primary-dark: var(--color-yellow-dark);
 					--color-primary-wash: var(--color-yellow-wash);
+					--wash-hue-tweak: -30;
 				}
 
 				/* INTRINSIC DARK THEME */
 				@media(prefers-color-scheme: dark) {
 					html {
+						--wash-saturation-tweak: ${darkModeSaturationTweak};
+						--mode-mult: -1;
 						${darkColors}
 						--color-dark-blend: var(--palette-light-blend);
 						--color-light-blend: var(--palette-dark-blend);
 						--color-black: var(--palette-white);
 						--color-white: var(--palette-black);
-						--color-wash: var(--palette-dark);
 						--color-gray-1: var(--palette-gray-ex-2);
 						--color-gray-2: var(--palette-gray-ex-1);
 						--color-gray-3: var(--palette-gray-0);
@@ -568,12 +654,13 @@ export default function presetAglio({ scale = 'md', interFontLocation = 'https:/
 				/** SYSTEM OVERRIDES **/
 				@media(prefers-color-scheme: dark) {
 					html.override-light {
+						--wash-saturation-tweak: ${lightModeSaturationTweak};
+						--mode-mult: 1;
 						${lightColors}
 						--color-dark-blend: var(--palette-dark-blend);
 						--color-light-blend: var(--palette-light-blend);
 						--color-black: var(--palette-black);
 						--color-white: var(--palette-white);
-						--color-wash: var(--palette-light);
 						--color-gray-1: var(--palette-gray-1);
 						--color-gray-2: var(--palette-gray-2);
 						--color-gray-3: var(--palette-gray-3);
@@ -594,12 +681,13 @@ export default function presetAglio({ scale = 'md', interFontLocation = 'https:/
 
 				@media(prefers-color-scheme: light) {
 					html.override-dark {
+						--wash-saturation-tweak: ${darkModeSaturationTweak};
+						--mode-mult: -1;
 						${darkColors}
 						--color-dark-blend: var(--palette-light-blend);
 						--color-light-blend: var(--palette-dark-blend);
 						--color-black: var(--palette-white);
 						--color-white: var(--palette-black);
-						--color-wash: var(--palette-dark);
 						--color-gray-1: var(--palette-gray-ex-2);
 						--color-gray-2: var(--palette-gray-ex-1);
 						--color-gray-3: var(--palette-gray-0);
@@ -631,6 +719,8 @@ export default function presetAglio({ scale = 'md', interFontLocation = 'https:/
 					--color-primary-light: var(--color-yellow-light);
 					--color-primary-dark: var(--color-yellow-dark);
 					--color-primary-wash: var(--color-yellow-wash);
+
+					--wash-hue-tweak: -30;
 				}
 
 				.theme-blueberry {
@@ -676,21 +766,25 @@ export default function presetAglio({ scale = 'md', interFontLocation = 'https:/
 					--color-primary-light: var(--color-green-light);
 					--color-primary-dark: var(--color-green-dark);
 					--color-primary-wash: var(--color-green-wash);
+
+					--wash-hue-tweak: 50;
 				}
 
 				.theme-tomato {
-					--color-attention-light: var(--color-yellow-light);
-					--color-attention: var(--color-yellow);
-					--color-attention-dark: var(--color-yellow-dark);
-					--color-attention-wash: var(--color-yellow-wash);
+					--color-attention-light: var(--color-red-light);
+					--color-attention: var(--color-red);
+					--color-attention-dark: var(--color-red-dark);
+					--color-attention-wash: var(--color-red-wash);
 					--color-accent: var(--color-green);
 					--color-accent-wash: var(--color-green-wash);
 					--color-accent-light: var(--color-green-light);
 					--color-accent-dark: var(--color-green-dark);
-					--color-primary: var(--color-red);
-					--color-primary-light: var(--color-red-light);
-					--color-primary-dark: var(--color-red-dark);
-					--color-primary-wash: var(--color-red-wash);
+					--color-primary: hsl(from var(--color-red) calc(h - 20) s l);
+					--color-primary-light: hsl(from var(--color-red-light) calc(h - 20) s l);
+					--color-primary-dark: hsl(from var(--color-red-dark) calc(h - 20) s l);
+					--color-primary-wash: hsl(from var(--color-red-wash) calc(h - 20) s l);
+
+					--wash-hue-tweak: -20;
 				}
 
 				.theme-salt {
@@ -747,6 +841,21 @@ export default function presetAglio({ scale = 'md', interFontLocation = 'https:/
 						overscroll-behavior: none;
 					}
 				}
+
+				@property --v-bg-altered {
+					syntax: "*";
+					inherits: false;
+				}
+
+				@property --v-color-altered {
+					syntax: "*";
+					inherits: false;
+				}
+
+				@property --v-border-altered {
+					syntax: "*";
+					inherits: false;
+				}
 			`,
             },
         ],
@@ -784,4 +893,39 @@ function makeSpacing(increment) {
         return acc;
     }, {})), { xs: 'calc(0.25rem * var(--spacing-scale,1))', sm: 'calc(0.5rem * var(--spacing-scale,1))', md: 'calc(1rem * var(--spacing-scale,1))', lg: 'calc(2rem * var(--spacing-scale,1))', xl: 'calc(3rem * var(--spacing-scale,1))' });
 }
+function resolveThemeColor(color, theme) {
+    if (typeof color === 'string' &&
+        color.startsWith('[') &&
+        color.endsWith(']')) {
+        return color.slice(1, -1);
+    }
+    const parts = color.split('-');
+    let resolveFrom = theme.colors;
+    let resolvedColor = color;
+    while (parts.length) {
+        const part = parts.shift();
+        if (!part)
+            break;
+        resolvedColor = resolveFrom[part];
+        resolveFrom = resolvedColor;
+        if (!resolveFrom)
+            break;
+    }
+    if (typeof resolvedColor === 'object' && 'DEFAULT' in resolvedColor) {
+        return resolvedColor.DEFAULT;
+    }
+    if (color === 'accent-light') {
+        console.log(resolveFrom, resolvedColor);
+    }
+    return resolvedColor;
+}
+function lighten(base, level, saturate) {
+    const levelNum = parseFloat(level) * 0.175;
+    const saturateNum = saturate ? parseFloat(saturate) : levelNum / 100;
+    return `hsl(from ${base} h calc(s * pow(${1 + saturateNum}, var(--mode-mult, 1))) calc(l * pow(${1 + levelNum}, var(--mode-mult, 1))))`;
+}
+function darken(base, level) {
+    const levelNum = parseFloat(level);
+    return lighten(base, (levelNum / -15).toString());
+}
 //# sourceMappingURL=uno.preset.js.map

package/dist/esm/uno.preset.js.map

@@ -1 +1 @@
-{"version":3,"file":"uno.preset.js","sourceRoot":"","sources":["../../src/uno.preset.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"uno.preset.js","sourceRoot":"","sources":["../../src/uno.preset.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@a-type/ui",
-  "version": "1.6.5",
+  "version": "1.7.1",
   "type": "module",
   "files": [
     "/dist",

package/src/components/box/Box.tsx

@@ -42,7 +42,7 @@ export interface BoxProps extends Omit<SlotDivProps, 'wrap'> {
 	wrap?: BoxResponsive<boolean>;
 	p?: BoxResponsive<BoxSpacingSize | boolean>;
 	container?: boolean;
-	surface?: boolean | 'primary' | 'accent';
+	surface?: boolean | 'primary' | 'accent' | 'default';
 	theme?: ThemeName;
 	border?: boolean;
 	full?: boolean | 'width' | 'height';
@@ -163,7 +163,8 @@ export function Box({
 					'layer-components:lg:p-lg': isResponsive(p) && p.lg === 'lg',
 					'layer-components:lg:p-xl': isResponsive(p) && p.lg === 'xl',
 					'layer-components:rounded-lg': !!surface,
-					'layer-components:(bg-white border-black)': surface === true,
+					'layer-components:(bg-white border-black)':
+						surface === true || surface === 'default',
 					'layer-components:(bg-primary-wash border-primary-dark)':
 						surface === 'primary',
 					'layer-components:(bg-accent-wash border-accent-dark)':

package/src/components/button/classes.tsx

@@ -13,12 +13,13 @@ export function getButtonClassName({
 	align?: ButtonProps['align'];
 }) {
 	return classNames(
-		'layer-components:(px-4 py-2 bg-[var(--bg)] [--webkit-tap-highlight-color:transparent] [line-height:1] text-size-md font-sans border border-solid border-transparent rounded-lg cursor-pointer font-bold flex flex-row gap-1 items-center relative overflow-visible select-none all:transition duration-200 whitespace-nowrap)',
-		'layer-components:hover:(bg-[var(--hover)] ring-4 ring-[var(--hover)])',
+		'layer-components:(px-4 py-2 bg-[var(--bg-neutral,var(--bg))] [--webkit-tap-highlight-color:transparent] [line-height:1] text-size-md font-sans border border-solid border-transparent rounded-lg cursor-pointer font-bold flex flex-row gap-1 items-center relative overflow-visible select-none all:transition duration-200 whitespace-nowrap ring-bg)',
+		'layer-components:()',
+		'layer-components:hover:(bg-[var(--bg)] bg-darken-2 ring-4)',
 		'layer-components:focus:outline-off',
-		'layer-components:focus-visible:(outline-off ring-6 ring-[var(--focus,var(--hover))])',
-		'layer-components:[&[data-focus=true]]:(ring-6 ring-[var(--focus,var(--hover))])',
-		'layer-components:active:(bg-[var(--active)] ring-8 ring-[var(--active)])',
+		'layer-components:focus-visible:(bg-[var(--bg)] outline-off bg-darken-7 ring-6)',
+		'layer-components:[&[data-focus=true]]:(ring-6 bg-darken-7)',
+		'layer-components:active:(bg-[var(--bg)] bg-darken-7 ring-8)',
 		'important:disabled:(opacity-50 cursor-default bg-[var(--bg)] shadow-none ring-none)',
 		'important:[&[data-disabled=true]]:(opacity-50 cursor-default bg-[var(--bg)] shadow-none)',
 		colors[color ?? 'default'],
@@ -30,19 +31,19 @@ export function getButtonClassName({
 		// compound variants
 		color === 'ghost' &&
 			toggleable &&
-			'layer-variants:[aria-pressed="true"]:bg-primary-wash',
+			'layer-variants:[aria-pressed="true"]:[--bg:var(--color-primary-wash)]',
 	);
 }
 
 const colors = {
-	primary: `layer-variants:[&.btn-color-primary]:([--bg:var(--color-primary-light)] [--hover:var(--color-primary)] [--focus:var(--color-primary)] [--active:var(--color-primary)] shadow-sm color-black border-primary-dark focus-visible:([--bg:var(--color-primary)]))`,
-	accent: `layer-variants:[&.btn-color-accent]:([--bg:var(--color-accent-wash)] [--hover:var(--color-accent-light)] [--focus:var(--color-accent-light)] [--active:var(--color-accent-light)] shadow-sm color-black border-accent-dark focus-visible:([--bg:var(--color-accent-light)]))`,
-	default: `layer-variants:[&.btn-color-default]:([--bg:var(--color-white)] [--hover:var(--color-gray-3)] [--focus:var(--color-gray-5)] [--active:var(--color-gray-4)] shadow-sm color-black border-gray-7)`,
-	ghost: `layer-variants:[&.btn-color-ghost]:([--bg:transparent] [--hover:var(--color-gray-blend)] [--focus:var(--color-gray-5)] [--active:var(--color-gray-dark-blend)] color-dark-blend)`,
-	destructive: `layer-variants:[&.btn-color-destructive]:([--bg:var(--color-attention-light)] [--hover:var(--color-attention-light)] [--focus:var(--color-attention-light)] [--active:var(--color-attention-light)] shadow-sm border-attention-dark color-black hover:([--bg:var(--colors-attention)]))`,
-	ghostDestructive: `layer-variants:[&.btn-color-ghostDestructive]:([--bg:transparent] [--hover:rgb(from_var(--color-attention-light)_r_g_b/0.25)] [--focus:var(--color-attention-light)] [--active:var(--color-attention-light)] color-attention-dark)`,
-	ghostAccent: `layer-variants:[&.btn-color-ghostAccent]:([--bg:transparent] [--hover:rgb(from_var(--color-accent-light)_r_g_b/0.25)] [--focus:var(--color-accent-light)] [--active:var(--color-accent-light)] color-accent-dark)`,
-	contrast: `layer-variants:[&.btn-color-contrast]:([--bg:var(--color-black)] [--hover:var(--color-gray-7)] [--focus:var(--color-gray-7)] [--active:var(--color-gray-6)] color-white border-black)`,
+	primary: `layer-variants:[&.btn-color-primary]:([--bg:var(--color-primary-light)] shadow-sm color-black border-primary-dark focus-visible:([--bg:var(--color-primary)]))`,
+	accent: `layer-variants:[&.btn-color-accent]:([--bg:var(--color-accent-wash)] shadow-sm color-black border-accent-dark focus-visible:([--bg:var(--color-accent-light)]))`,
+	default: `layer-variants:[&.btn-color-default]:([--bg:var(--color-white)] shadow-sm color-black border-gray-dark)`,
+	ghost: `layer-variants:[&.btn-color-ghost]:([--bg-neutral:transparent] [--bg:var(--color-white)] color-darkBlend)`,
+	destructive: `layer-variants:[&.btn-color-destructive]:([--bg:var(--color-attention-light)] shadow-sm border-attention-dark color-black hover:([--bg:var(--colors-attention)]))`,
+	ghostDestructive: `layer-variants:[&.btn-color-ghostDestructive]:([--bg-neutral:transparent] [--bg:var(--color-attention-light)] color-attention-dark hover:(bg-darken-1 color-black) focus-visible:(bg-darken-2 color-black) active:bg-darken-2)`,
+	ghostAccent: `layer-variants:[&.btn-color-ghostAccent]:([--bg-neutral:transparent] [--bg:var(--color-accent-wash)] color-accent-dark hover:bg-darken-2 focus-visible:bg-darken-6 active:bg-darken-6)`,
+	contrast: `layer-variants:[&.btn-color-contrast]:([--bg:var(--color-black)] color-white border-black hover:bg-lighten-1 focus-visible:bg-lighten-5 active:bg-lighten-4)`,
 	unstyled: `layer-variants:(bg-transparent hover:(bg-transparent) focus:(bg-transparent) active:(bg-transparent) color-inherit border-none shadow-none hover:(shadow-none) focus:(shadow-none) active:(shadow-none) p-0 items-start font-inherit font-normal rounded-none text-size-inherit transition-none)`,
 };
 export const buttonColorClasses = colors;

package/src/components/camera/Camera.tsx

@@ -214,8 +214,8 @@ export function CameraShutterButton({
 const StyledShutterButton = withClassName(
 	'button',
 	'absolute bottom-3 left-1/2 -translate-x-1/2 w-16 h-16 bg-white rounded-lg cursor-pointer border-2 border-black border-solid ring-2 ring-white opacity-80',
-	'hover:bg-gray-1 hover:opacity-100',
-	'focus-visible:bg-gray-2',
+	'hover:bg-gray-wash hover:opacity-100',
+	'focus-visible:bg-lighten-1',
 	'focus:ring-primary focus:outline-none focus:opacity-100',
 	'sm:w-8 sm:h-8',
 );

package/src/components/card/Card.tsx

@@ -7,7 +7,7 @@ import { SlotDiv } from '../utility/SlotDiv.js';
 
 export const CardRoot = withClassName(
 	'div',
-	'layer-components:(flex flex-col border-light rounded-lg text-lg overflow-hidden h-max-content relative bg-gray-1 text-black shadow-sm)',
+	'layer-components:(flex flex-col border-light rounded-lg text-lg overflow-hidden h-max-content relative bg-wash bg-darken-0.5 text-black shadow-sm)',
 	'layer-variants:[&[data-borderless=true]]:(border-none shadow-md)',
 );
 
@@ -41,8 +41,8 @@ export function CardMain({
 				isInteractive &&
 					classNames(
 						'layer-components:cursor-pointer layer-components:hover:(bg-gray-darkBlend color-black shadow-sm-inset) layer-components:focus:outline-none',
-						'layer-components:focus-visible:(outline-none ring-inset ring-4 ring-gray-5)',
-						'layer-components:[&[data-visually-focused=true]]:(ring-inset ring-4 ring-gray-5)',
+						'layer-components:focus-visible:(outline-none ring-inset ring-4 ring-gray)',
+						'layer-components:[&[data-visually-focused=true]]:(ring-inset ring-4 ring-gray)',
 						'layer-components:[&[data-visually-disabled=true]]:(cursor-default) layer-components:disabled:(cursor-default)',
 					),
 				className,
@@ -60,12 +60,12 @@ export const CardTitle = withClassName(
 	'div',
 	'layer-components:(flex flex-col gap-1 mt-0 bg-white py-2 px-3 rounded-lg rounded-bl-none rounded-tr-none w-auto mr-auto border border-solid border-grayDarkBlend text-md max-h-80px overflow-hidden text-ellipsis max-w-full text-inherit font-semibold relative z-1)',
 	'layer-components:[[data-compact=true]_&]:(py-1 text-sm)',
-	'layer-components:[[data-interactive=true]:hover>&]:(bg-gray-2)',
+	'layer-components:[[data-interactive=true]:hover>&]:(bg-gray-light)',
 );
 
 const CardContentRoot = withClassName(
 	'div',
-	'layer-components:(flex flex-col gap-1 px-2 py-1 bg-light-blend text-black rounded-md mx-2 my-0.5 border border-solid border-grayDarkBlend text-xs relative z-1)',
+	'layer-components:(flex flex-col gap-1 px-2 py-1 bg-lightBlend text-black rounded-md mx-2 my-0.5 border border-solid border-gray-darkBlend text-xs relative z-1)',
 	'layer-variants:[[data-compact=true]_&]:(py-0 px-1 my-0 text-xs)',
 	'layer-variants:[&[data-unstyled=true]]:(p-0 [background:unset] border-none)',
 );

package/src/components/checkbox/Checkbox.tsx

@@ -13,7 +13,7 @@ export const CheckboxRoot = withClassName(
 		'layer-components:focus-visible:(outline-off shadow-focus)',
 		'layer-components:[&[data-state=checked]]:(bg-primary-light border-primary-dark)',
 		'layer-components:[&:hover:not(:disabled)]:shadow-[0_0_0_1px_var(--color-black)]',
-		'layer-components:[&:disabled]:(bg-transparent border-gray-3 shadow-none)',
+		'layer-components:[&:disabled]:(bg-transparent border-gray-light shadow-none)',
 	),
 );
 

package/src/components/datePicker/DatePicker.tsx

@@ -216,18 +216,18 @@ const CalendarDay = withClassName(
 	'hover:(z-1 outline-accent)',
 	'active:(bg-accent-wash rounded)',
 	'[&[data-selected]]:(bg-accent-light z-2 rounded)',
-	'[&[data-in-range]]:(bg-accent-wash rounded-none z-1)',
+	'[&[data-in-range]]:(bg-accent-wash bg-darken-0.5 rounded-none z-1)',
 	'[&[data-range-start]]:(bg-accent-light rounded-l rounded-r-none z-1)',
 	'[&[data-range-end]]:(bg-accent-light rounded-r rounded-l-none z-1)',
 	'disabled:(opacity-50 cursor-default)',
 	// today dot
 	"[&[data-today]]:before:(content-[''] absolute left-[2px] top-[2px] w-[6px] h-[6px] rounded-lg bg-primary)",
-	'[&[data-top-edge]]:(border-t-gray-5)',
-	'[&[data-bottom-edge]]:(border-b-gray-5)',
-	'[&[data-first-column]]:(border-l-gray-5)',
-	'[&[data-last-column]]:(border-r-gray-5)',
-	'[&[data-day-first]]:(border-l-gray-5 rounded-tl)',
-	'[&[data-day-last]]:(border-r-gray-5 rounded-br)',
+	'[&[data-top-edge]]:(border-t-gray)',
+	'[&[data-bottom-edge]]:(border-b-gray)',
+	'[&[data-first-column]]:(border-l-gray)',
+	'[&[data-last-column]]:(border-r-gray)',
+	'[&[data-day-first]]:(border-l-gray rounded-tl)',
+	'[&[data-day-last]]:(border-r-gray rounded-br)',
 	'[&[data-first-column][data-bottom-edge]]:rounded-bl',
 	'[&[data-last-column][data-bottom-edge]]:rounded-br',
 	'[&[data-first-column][data-top-edge]]:rounded-tl',
@@ -237,7 +237,7 @@ const CalendarDay = withClassName(
 
 const DayLabel = withClassName(
 	'div',
-	'flex items-center justify-center text-sm text-gray-6',
+	'flex items-center justify-center text-sm text-gray-dark',
 );
 
 const DayLabels = () => (