diff --git a/.storybook/preview.jsx b/.storybook/preview.jsx index 4b3c1809b..550a4872a 100644 --- a/.storybook/preview.jsx +++ b/.storybook/preview.jsx @@ -83,7 +83,7 @@ export const decorators = [ diff --git a/packages/components/button/src/variants/contrast.ts b/packages/components/button/src/variants/contrast.ts index 32046dd82..e06a103fe 100644 --- a/packages/components/button/src/variants/contrast.ts +++ b/packages/components/button/src/variants/contrast.ts @@ -7,8 +7,8 @@ export const contrastVariants = [ class: tw([ 'text-main', 'hover:bg-main-container-hovered', - 'enabled:active:bg-main-container-pressed', - 'focus-visible:bg-main-container-focused', + 'enabled:active:bg-main-container-hovered', + 'focus-visible:bg-main-container-hovered', ]), }, { @@ -17,8 +17,8 @@ export const contrastVariants = [ class: tw([ 'text-support', 'hover:bg-support-container-hovered', - 'enabled:active:bg-support-container-pressed', - 'focus-visible:bg-support-container-focused', + 'enabled:active:bg-support-container-hovered', + 'focus-visible:bg-support-container-hovered', ]), }, { @@ -27,8 +27,8 @@ export const contrastVariants = [ class: tw([ 'text-accent', 'hover:bg-accent-container-hovered', - 'enabled:active:bg-accent-container-pressed', - 'focus-visible:bg-accent-container-focused', + 'enabled:active:bg-accent-container-hovered', + 'focus-visible:bg-accent-container-hovered', ]), }, { @@ -37,8 +37,8 @@ export const contrastVariants = [ class: tw([ 'text-basic', 'hover:bg-basic-container-hovered', - 'enabled:active:bg-basic-container-pressed', - 'focus-visible:bg-basic-container-focused', + 'enabled:active:bg-basic-container-hovered', + 'focus-visible:bg-basic-container-hovered', ]), }, { @@ -47,8 +47,8 @@ export const contrastVariants = [ class: tw([ 'text-success', 'hover:bg-success-container-hovered', - 'enabled:active:bg-success-container-pressed', - 'focus-visible:bg-success-container-focused', + 'enabled:active:bg-success-container-hovered', + 'focus-visible:bg-success-container-hovered', ]), }, { @@ -57,8 +57,8 @@ export const contrastVariants = [ class: tw([ 'text-alert', 'hover:bg-alert-container-hovered', - 'enabled:active:bg-alert-container-pressed', - 'focus-visible:bg-alert-container-focused', + 'enabled:active:bg-alert-container-hovered', + 'focus-visible:bg-alert-container-hovered', ]), }, { @@ -67,8 +67,8 @@ export const contrastVariants = [ class: tw([ 'text-error', 'hover:bg-error-container-hovered', - 'enabled:active:bg-error-container-pressed', - 'focus-visible:bg-error-container-focused', + 'enabled:active:bg-error-container-hovered', + 'focus-visible:bg-error-container-hovered', ]), }, { @@ -77,8 +77,8 @@ export const contrastVariants = [ class: tw([ 'text-info', 'hover:bg-info-container-hovered', - 'enabled:active:bg-info-container-pressed', - 'focus-visible:bg-info-container-focused', + 'enabled:active:bg-info-container-hovered', + 'focus-visible:bg-info-container-hovered', ]), }, { @@ -87,8 +87,8 @@ export const contrastVariants = [ class: tw([ 'text-neutral', 'hover:bg-neutral-container-hovered', - 'enabled:active:bg-neutral-container-pressed', - 'focus-visible:bg-neutral-container-focused', + 'enabled:active:bg-neutral-container-hovered', + 'focus-visible:bg-neutral-container-hovered', ]), }, { @@ -97,8 +97,8 @@ export const contrastVariants = [ class: tw([ 'text-on-surface', 'hover:bg-surface-hovered', - 'enabled:active:bg-surface-pressed', - 'focus-visible:bg-surface-focused', + 'enabled:active:bg-surface-hovered', + 'focus-visible:bg-surface-hovered', ]), }, ] as const diff --git a/packages/components/button/src/variants/filled.ts b/packages/components/button/src/variants/filled.ts index cdff195e5..001eff761 100644 --- a/packages/components/button/src/variants/filled.ts +++ b/packages/components/button/src/variants/filled.ts @@ -9,8 +9,8 @@ export const filledVariants = [ 'bg-main', 'text-on-main', 'hover:bg-main-hovered', - 'enabled:active:bg-main-pressed', - 'focus-visible:bg-main-focused', + 'enabled:active:bg-main-hovered', + 'focus-visible:bg-main-hovered', ]), }, // Support @@ -21,8 +21,8 @@ export const filledVariants = [ 'bg-support', 'text-on-support', 'hover:bg-support-hovered', - 'enabled:active:bg-support-pressed', - 'focus-visible:bg-support-focused', + 'enabled:active:bg-support-hovered', + 'focus-visible:bg-support-hovered', ]), }, // Accent @@ -33,8 +33,8 @@ export const filledVariants = [ 'bg-accent', 'text-on-accent', 'hover:bg-accent-hovered', - 'enabled:active:bg-accent-pressed', - 'focus-visible:bg-accent-focused', + 'enabled:active:bg-accent-hovered', + 'focus-visible:bg-accent-hovered', ]), }, // Basic @@ -45,8 +45,8 @@ export const filledVariants = [ 'bg-basic', 'text-on-basic', 'hover:bg-basic-hovered', - 'enabled:active:bg-basic-pressed', - 'focus-visible:bg-basic-focused', + 'enabled:active:bg-basic-hovered', + 'focus-visible:bg-basic-hovered', ]), }, // Success @@ -57,8 +57,8 @@ export const filledVariants = [ 'bg-success', 'text-on-success', 'hover:bg-success-hovered', - 'enabled:active:bg-success-pressed', - 'focus-visible:bg-success-focused', + 'enabled:active:bg-success-hovered', + 'focus-visible:bg-success-hovered', ]), }, // Alert @@ -69,8 +69,8 @@ export const filledVariants = [ 'bg-alert', 'text-on-alert', 'hover:bg-alert-hovered', - 'enabled:active:bg-alert-pressed', - 'focus-visible:bg-alert-focused', + 'enabled:active:bg-alert-hovered', + 'focus-visible:bg-alert-hovered', ]), }, // Danger @@ -79,8 +79,8 @@ export const filledVariants = [ design: 'filled', class: tw([ 'text-on-error bg-error', - 'hover:bg-error-hovered enabled:active:bg-error-pressed', - 'focus-visible:bg-error-focused', + 'hover:bg-error-hovered enabled:active:bg-error-hovered', + 'focus-visible:bg-error-hovered', ]), }, // Info @@ -89,8 +89,8 @@ export const filledVariants = [ design: 'filled', class: tw([ 'text-on-error bg-info', - 'hover:bg-info-hovered enabled:active:bg-info-pressed', - 'focus-visible:bg-info-focused', + 'hover:bg-info-hovered enabled:active:bg-info-hovered', + 'focus-visible:bg-info-hovered', ]), }, // Neutral @@ -101,8 +101,8 @@ export const filledVariants = [ 'bg-neutral', 'text-on-neutral', 'hover:bg-neutral-hovered', - 'enabled:active:bg-neutral-pressed', - 'focus-visible:bg-neutral-focused', + 'enabled:active:bg-neutral-hovered', + 'focus-visible:bg-neutral-hovered', ]), }, // Surface @@ -113,8 +113,8 @@ export const filledVariants = [ 'bg-surface', 'text-on-surface', 'hover:bg-surface-hovered', - 'enabled:active:bg-surface-pressed', - 'focus-visible:bg-surface-focused', + 'enabled:active:bg-surface-hovered', + 'focus-visible:bg-surface-hovered', ]), }, ] as const diff --git a/packages/components/button/src/variants/tinted.ts b/packages/components/button/src/variants/tinted.ts index a1f325982..79ca009d0 100644 --- a/packages/components/button/src/variants/tinted.ts +++ b/packages/components/button/src/variants/tinted.ts @@ -8,8 +8,8 @@ export const tintedVariants = [ 'bg-main-container', 'text-on-main-container', 'hover:bg-main-container-hovered', - 'enabled:active:bg-main-container-pressed', - 'focus-visible:bg-main-container-focused', + 'enabled:active:bg-main-container-hovered', + 'focus-visible:bg-main-container-hovered', ]), }, { @@ -19,8 +19,8 @@ export const tintedVariants = [ 'bg-support-container', 'text-on-support-container', 'hover:bg-support-container-hovered', - 'enabled:active:bg-support-container-pressed', - 'focus-visible:bg-support-container-focused', + 'enabled:active:bg-support-container-hovered', + 'focus-visible:bg-support-container-hovered', ]), }, { @@ -30,8 +30,8 @@ export const tintedVariants = [ 'bg-accent-container', 'text-on-accent-container', 'hover:bg-accent-container-hovered', - 'enabled:active:bg-accent-container-pressed', - 'focus-visible:bg-accent-container-focused', + 'enabled:active:bg-accent-container-hovered', + 'focus-visible:bg-accent-container-hovered', ]), }, { @@ -41,8 +41,8 @@ export const tintedVariants = [ 'bg-basic-container', 'text-on-basic-container', 'hover:bg-basic-container-hovered', - 'enabled:active:bg-basic-container-pressed', - 'focus-visible:bg-basic-container-focused', + 'enabled:active:bg-basic-container-hovered', + 'focus-visible:bg-basic-container-hovered', ]), }, { @@ -52,8 +52,8 @@ export const tintedVariants = [ 'bg-success-container', 'text-on-success-container', 'hover:bg-success-container-hovered', - 'enabled:active:bg-success-container-pressed', - 'focus-visible:bg-success-container-focused', + 'enabled:active:bg-success-container-hovered', + 'focus-visible:bg-success-container-hovered', ]), }, { @@ -63,8 +63,8 @@ export const tintedVariants = [ 'bg-alert-container', 'text-on-alert-container', 'hover:bg-alert-container-hovered', - 'enabled:active:bg-alert-container-pressed', - 'focus-visible:bg-alert-container-focused', + 'enabled:active:bg-alert-container-hovered', + 'focus-visible:bg-alert-container-hovered', ]), }, { @@ -74,8 +74,8 @@ export const tintedVariants = [ 'bg-error-container', 'text-on-error-container', 'hover:bg-error-container-hovered', - 'enabled:active:bg-error-container-pressed', - 'focus-visible:bg-error-container-focused', + 'enabled:active:bg-error-container-hovered', + 'focus-visible:bg-error-container-hovered', ]), }, { @@ -85,8 +85,8 @@ export const tintedVariants = [ 'bg-info-container', 'text-on-info-container', 'hover:bg-info-container-hovered', - 'enabled:active:bg-info-container-pressed', - 'focus-visible:bg-info-container-focused', + 'enabled:active:bg-info-container-hovered', + 'focus-visible:bg-info-container-hovered', ]), }, { @@ -96,8 +96,8 @@ export const tintedVariants = [ 'bg-neutral-container', 'text-on-neutral-container', 'hover:bg-neutral-container-hovered', - 'enabled:active:bg-neutral-container-pressed', - 'focus-visible:bg-neutral-container-focused', + 'enabled:active:bg-neutral-container-hovered', + 'focus-visible:bg-neutral-container-hovered', ]), }, { @@ -107,8 +107,8 @@ export const tintedVariants = [ 'bg-surface', 'text-on-surface', 'hover:bg-surface-hovered', - 'enabled:active:bg-surface-pressed', - 'focus-visible:bg-surface-focused', + 'enabled:active:bg-surface-hovered', + 'focus-visible:bg-surface-hovered', ]), }, ] as const diff --git a/packages/components/chip/src/variants/tinted.ts b/packages/components/chip/src/variants/tinted.ts index 10b560570..4d46e46c9 100644 --- a/packages/components/chip/src/variants/tinted.ts +++ b/packages/components/chip/src/variants/tinted.ts @@ -8,8 +8,8 @@ export const tintedVariants = [ class: tw([ 'bg-main-container', 'enabled:hover:bg-main-container-hovered', - 'enabled:active:bg-main-container-pressed', - 'focus-visible:bg-main-container-focused', + 'enabled:active:bg-main-container-hovered', + 'focus-visible:bg-main-container-hovered', 'aria-pressed:bg-main aria-pressed:text-on-main aria-pressed:enabled:hover:bg-main/dim-1', 'text-on-main-container', ]), @@ -20,8 +20,8 @@ export const tintedVariants = [ class: tw([ 'bg-support-container', 'enabled:hover:bg-support-container-hovered', - 'enabled:active:bg-support-container-pressed', - 'focus-visible:bg-support-container-focused', + 'enabled:active:bg-support-container-hovered', + 'focus-visible:bg-support-container-hovered', 'aria-pressed:bg-support aria-pressed:text-on-support aria-pressed:enabled:hover:bg-support/dim-1', 'text-on-support-container', ]), @@ -32,8 +32,8 @@ export const tintedVariants = [ class: tw([ 'bg-basic-container', 'enabled:hover:bg-basic-container-hovered', - 'enabled:active:bg-basic-container-pressed', - 'focus-visible:bg-basic-container-focused', + 'enabled:active:bg-basic-container-hovered', + 'focus-visible:bg-basic-container-hovered', 'aria-pressed:bg-basic aria-pressed:text-on-basic aria-pressed:enabled:hover:bg-basic/dim-1', 'text-on-basic-container', ]), @@ -44,8 +44,8 @@ export const tintedVariants = [ class: tw([ 'bg-accent-container', 'enabled:hover:bg-accent-container-hovered', - 'enabled:active:bg-accent-container-pressed', - 'focus-visible:bg-accent-container-focused', + 'enabled:active:bg-accent-container-hovered', + 'focus-visible:bg-accent-container-hovered', 'aria-pressed:bg-accent aria-pressed:text-on-accent aria-pressed:enabled:hover:bg-accent/dim-1', 'text-on-accent-container', ]), @@ -56,8 +56,8 @@ export const tintedVariants = [ class: tw([ 'bg-success-container', 'enabled:hover:bg-success-container-hovered', - 'enabled:active:bg-success-container-pressed', - 'focus-visible:bg-success-container-focused', + 'enabled:active:bg-success-container-hovered', + 'focus-visible:bg-success-container-hovered', 'aria-pressed:bg-success aria-pressed:text-on-success aria-pressed:enabled:hover:bg-success/dim-1', 'text-on-success-container', ]), @@ -68,8 +68,8 @@ export const tintedVariants = [ class: tw([ 'bg-alert-container', 'enabled:hover:bg-alert-container-hovered', - 'enabled:active:bg-alert-container-pressed', - 'focus-visible:bg-alert-container-focused', + 'enabled:active:bg-alert-container-hovered', + 'focus-visible:bg-alert-container-hovered', 'aria-pressed:bg-alert aria-pressed:text-on-alert aria-pressed:enabled:hover:bg-alert/dim-1', 'text-on-alert-container', ]), @@ -80,8 +80,8 @@ export const tintedVariants = [ class: tw([ 'bg-error-container', 'enabled:hover:bg-error-container-hovered', - 'enabled:active:bg-error-container-pressed', - 'focus-visible:bg-error-container-focused', + 'enabled:active:bg-error-container-hovered', + 'focus-visible:bg-error-container-hovered', 'aria-pressed:bg-error aria-pressed:text-on-error aria-pressed:enabled:hover:bg-error/dim-1', 'text-on-error-container', ]), @@ -92,8 +92,8 @@ export const tintedVariants = [ class: tw([ 'bg-info-container', 'enabled:hover:bg-info-container-hovered', - 'enabled:active:bg-info-container-pressed', - 'focus-visible:bg-info-container-focused', + 'enabled:active:bg-info-container-hovered', + 'focus-visible:bg-info-container-hovered', 'aria-pressed:bg-info aria-pressed:text-on-info aria-pressed:enabled:hover:bg-info/dim-1', 'text-on-info-container', ]), @@ -104,8 +104,8 @@ export const tintedVariants = [ class: tw([ 'bg-neutral-container', 'enabled:hover:bg-neutral-container-hovered', - 'enabled:active:bg-neutral-container-pressed', - 'focus-visible:bg-neutral-container-focused', + 'enabled:active:bg-neutral-container-hovered', + 'focus-visible:bg-neutral-container-hovered', 'aria-pressed:bg-neutral aria-pressed:text-on-neutral aria-pressed:enabled:hover:bg-neutral/dim-1', 'text-on-neutral-container', ]), @@ -116,8 +116,8 @@ export const tintedVariants = [ class: tw([ 'bg-surface/dim-1', 'enabled:hover:bg-surface-hovered/dim-1', - 'enabled:active:bg-surface-pressed/dim-1', - 'focus-visible:bg-surface-focused/dim-1', + 'enabled:active:bg-surface-hovered/dim-1', + 'focus-visible:bg-surface-hovered/dim-1', 'aria-pressed:bg-surface aria-pressed:text-on-surface aria-pressed:enabled:hover:bg-surface-hovered', 'text-on-surface/dim-1', ]), diff --git a/packages/utils/theme/src/defaultTheme.ts b/packages/utils/theme/src/defaultTheme.ts index 9cab0d323..4a58fc5af 100644 --- a/packages/utils/theme/src/defaultTheme.ts +++ b/packages/utils/theme/src/defaultTheme.ts @@ -27,128 +27,86 @@ export const defaultTheme: Theme = { basic: '#094171', onBasic: '#FFFFFF', basicHovered: '#0C5291', - basicPressed: '#0C5291', - basicFocused: '#0C5291', // Basic Container basicContainer: '#E6F2FD', onBasicContainer: '#152233', basicContainerHovered: '#F4F9FE', - basicContainerPressed: '#F4F9FE', - basicContainerFocused: '#F4F9FE', // Accent accent: '#8526D9', onAccent: '#FFFFFF', accentHovered: '#9F47EB', - accentPressed: '#9F47EB', - accentFocused: '#9F47EB', // Accent Container accentContainer: '#E9D6FA', onAccentContainer: '#362555', accentContainerHovered: '#F5EDFD', - accentContainerPressed: '#F5EDFD', - accentContainerFocused: '#F5EDFD', // Accent Variant accentVariant: '#501782', onAccentVariant: '#FFFFFF', accentVariantHovered: '#6B1FAD', - accentVariantPressed: '#6B1FAD', - accentVariantFocused: '#6B1FAD', // Main main: '#EC5A13', onMain: '#FFFFFF', mainHovered: '#F07B42', - mainPressed: '#F07B42', - mainFocused: '#F07B42', // Main container mainContainer: '#FFE9DE', onMainContainer: '#89380F', mainContainerHovered: '#FFF2EB', - mainContainerPressed: '#FFF2EB', - mainContainerFocused: '#FFF2EB', // Main Variant mainVariant: '#B84A14', onMainVariant: '#FFFFFF', mainVariantHovered: '#EC5A13', - mainVariantPressed: '#EC5A13', - mainVariantFocused: '#EC5A13', // Support support: '#094171', onSupport: '#FFFFFF', supportHovered: '#0C5291', - supportPressed: '#0C5291', - supportFocused: '#0C5291', // Support Container supportContainer: '#E6F2FD', onSupportContainer: '#152233', supportContainerHovered: '#F4F9FE', - supportContainerPressed: '#F4F9FE', - supportContainerFocused: '#F4F9FE', // Support Variant supportVariant: '#0C5291', onSupportVariant: '#FFFFFF', supportVariantHovered: '#0F69B9', - supportVariantPressed: '#0F69B9', - supportVariantFocused: '#0F69B9', // Success success: '#3E7A40', onSuccess: '#FFFFFF', successHovered: '#4E9850', - successPressed: '#4E9850', - successFocused: '#4E9850', // Success container successContainer: '#DCEADC', onSuccessContainer: '#2F5B30', successContainerHovered: '#EDF5EE', - successContainerPressed: '#EDF5EE', - successContainerFocused: '#EDF5EE', // Alert alert: '#FFAA00', onAlert: '#202730', alertHovered: '#FFBB33', - alertPressed: '#FFBB33', - alertFocused: '#FFBB33', // Alert container alertContainer: '#FFEECC', onAlertContainer: '#996600', alertContainerHovered: '#FFF6E5', - alertContainerPressed: '#FFF6E5', - alertContainerFocused: '#FFF6E5', // Error error: '#D93426', onError: '#FFFFFF', errorHovered: '#E05D52', - errorPressed: '#E05D52', - errorFocused: '#E05D52', // Error container errorContainer: '#F7D7D4', onErrorContainer: '#822017', errorContainerHovered: '#FBECEB', - errorContainerPressed: '#FBECEB', - errorContainerFocused: '#FBECEB', // Info info: '#1388EC', onInfo: '#FFFFFF', infoHovered: '#69B2F3', - infoPressed: '#69B2F3', - infoFocused: '#69B2F3', // Info container infoContainer: '#C2E0FA', onInfoContainer: '#0C5291', infoContainerHovered: '#E6F2FD', - infoContainerPressed: '#E6F2FD', - infoContainerFocused: '#E6F2FD', // Neutral neutral: '#4F6076', onNeutral: '#FFFFFF', neutralHovered: '#6C819D', - neutralPressed: '#6C819D', - neutralFocused: '#6C819D', // Neutral container neutralContainer: '#F0F2F5', onNeutralContainer: '#3A4757', neutralContainerHovered: '#F6F8F9', - neutralContainerPressed: '#F6F8F9', - neutralContainerFocused: '#F6F8F9', // Background background: '#FFFFFF', onBackground: '#152233', @@ -159,14 +117,10 @@ export const defaultTheme: Theme = { surface: '#FFFFFF', onSurface: '#152233', surfaceHovered: '#F6F8F9', - surfacePressed: '#F6F8F9', - surfaceFocused: '#F6F8F9', // Surface Inverse surfaceInverse: '#2B3441', onSurfaceInverse: '#FFFFFF', surfaceInverseHovered: '#3A4757', - surfaceInversePressed: '#3A4757', - surfaceInverseFocused: '#3A4757', // Outline outline: '#ACB8C7', outlineHigh: '#202730', diff --git a/packages/utils/theme/src/defaultThemeDark.ts b/packages/utils/theme/src/defaultThemeDark.ts index 0d1f47874..199f21b70 100644 --- a/packages/utils/theme/src/defaultThemeDark.ts +++ b/packages/utils/theme/src/defaultThemeDark.ts @@ -15,128 +15,86 @@ export const defaultThemeDark: Theme = createTheme({ basic: '#C2E0FA', onBasic: '#152233', basicHovered: '#9FCEF7', - basicPressed: '#9FCEF7', - basicFocused: '#9FCEF7', // Basic Container basicContainer: '#094171', onBasicContainer: '#F4F9FE', basicContainerHovered: '#152233', - basicContainerPressed: '#152233', - basicContainerFocused: '#152233', // Accent accent: '#CFA3F5', onAccent: '#1B052E', accentHovered: '#AC7DDD', - accentPressed: '#AC7DDD', - accentFocused: '#AC7DDD', // Accent Container accentContainer: '#501782', onAccentContainer: '#F5EDFD', accentContainerHovered: '#360F57', - accentContainerPressed: '#360F57', - accentContainerFocused: '#360F57', // Accent Variant accentVariant: '#B775F0', onAccentVariant: '#1B052E', accentVariantHovered: '#B775F0', - accentVariantPressed: '#B775F0', - accentVariantFocused: '#B775F0', // Main main: '#F07B42', onMain: '#2F1305', mainHovered: '#EC5A13', - mainPressed: '#EC5A13', - mainFocused: '#EC5A13', // Main container mainContainer: '#89380F', onMainContainer: '#FFF2EB', mainContainerHovered: '#5C250A', - mainContainerPressed: '#5C250A', - mainContainerFocused: '#5C250A', // Main Variant mainVariant: '#F49D71', onMainVariant: '#2F1305', mainVariantHovered: '#6194FF', - mainVariantPressed: '#6194FF', - mainVariantFocused: '#6194FF', // Support support: '#C2E0FA', onSupport: '#152233', supportHovered: '#9FCEF7', - supportPressed: '#9FCEF7', - supportFocused: '#9FCEF7', // Support Container supportContainer: '#094171', onSupportContainer: '#F4F9FE', supportContainerHovered: '#152233', - supportContainerPressed: '#152233', - supportContainerFocused: '#152233', // Support Variant supportVariant: '#E6F2FD', onSupportVariant: '#152233', supportVariantHovered: '#C2E0FA', - supportVariantPressed: '#C2E0FA', - supportVariantFocused: '#C2E0FA', // Success success: '#95C196', onSuccess: '#101E10', successHovered: '#71AD73', - successPressed: '#71AD73', - successFocused: '#71AD73', // Success container successContainer: '#2F5B30', onSuccessContainer: '#EDF5EE', successContainerHovered: '#1F3D20', - successContainerPressed: '#1F3D20', - successContainerFocused: '#1F3D20', // Alert alert: '#FFCC66', onAlert: '#332200', alertHovered: '#FFBB33', - alertPressed: '#FFBB33', - alertFocused: '#FFBB33', // Alert container alertContainer: '#664400', onAlertContainer: '#FFF6E5', alertContainerHovered: '#332200', - alertContainerPressed: '#332200', - alertContainerFocused: '#332200', // Error error: '#E8867D', onError: '#2B0B08', errorHovered: '#E05D52', - errorPressed: '#E05D52', - errorFocused: '#E05D52', // Error container errorContainer: '#822017', onErrorContainer: '#FBECEB', errorContainerHovered: '#57150F', - errorContainerPressed: '#57150F', - errorContainerFocused: '#57150F', // Info info: '#9FCEF7', onInfo: '#152233', infoHovered: '#69B2F3', - infoPressed: '#69B2F3', - infoFocused: '#69B2F3', // Info container infoContainer: '#0C5291', onInfoContainer: '#F4F9FE', infoContainerHovered: '#094171', - infoContainerPressed: '#094171', - infoContainerFocused: '#094171', // Neutral neutral: '#ACB8C7', onNeutral: '#202730', neutralHovered: '#6C819D', - neutralPressed: '#6C819D', - neutralFocused: '#6C819D', // Neutral container neutralContainer: '#3A4757', onNeutralContainer: '#F6F8F9', neutralContainerHovered: '#2B3441', - neutralContainerPressed: '#2B3441', - neutralContainerFocused: '#2B3441', // Background background: '#202730', onBackground: '#F6F8F9', @@ -147,14 +105,10 @@ export const defaultThemeDark: Theme = createTheme({ surface: '#202730', onSurface: '#F6F8F9', surfaceHovered: '#000000', - surfacePressed: '#000000', - surfaceFocused: '#000000', // Surface Inverse surfaceInverse: '#F6F8F9', onSurfaceInverse: '#2B3441', surfaceInverseHovered: '#F0F2F5', - surfaceInversePressed: '#F0F2F5', - surfaceInverseFocused: '#F0F2F5', // Outline outline: '#4F6076', outlineHigh: '#F0F2F5', diff --git a/packages/utils/theme/src/types.ts b/packages/utils/theme/src/types.ts index 5ac3f8f1c..3bb98de8b 100644 --- a/packages/utils/theme/src/types.ts +++ b/packages/utils/theme/src/types.ts @@ -36,130 +36,88 @@ export interface Theme { basic: string onBasic: string basicHovered: string - basicPressed: string - basicFocused: string // Basic Container basicContainer: string onBasicContainer: string basicContainerHovered: string - basicContainerPressed: string - basicContainerFocused: string // Accent accent: string onAccent: string accentHovered: string - accentPressed: string - accentFocused: string // Accent Container accentContainer: string onAccentContainer: string accentContainerHovered: string - accentContainerPressed: string - accentContainerFocused: string // Accent Variant accentVariant: string onAccentVariant: string accentVariantHovered: string - accentVariantPressed: string - accentVariantFocused: string // Main main: string onMain: string mainHovered: string - mainPressed: string - mainFocused: string mainContainer: string onMainContainer: string mainContainerHovered: string - mainContainerPressed: string - mainContainerFocused: string // Support support: string onSupport: string supportHovered: string - supportPressed: string - supportFocused: string supportContainer: string onSupportContainer: string supportContainerHovered: string - supportContainerPressed: string - supportContainerFocused: string // Main Variant mainVariant: string onMainVariant: string mainVariantHovered: string - mainVariantPressed: string - mainVariantFocused: string // Support Variant supportVariant: string onSupportVariant: string supportVariantHovered: string - supportVariantPressed: string - supportVariantFocused: string // Success success: string onSuccess: string successHovered: string - successPressed: string - successFocused: string successContainer: string onSuccessContainer: string successContainerHovered: string - successContainerPressed: string - successContainerFocused: string // Alert alert: string onAlert: string alertHovered: string - alertPressed: string - alertFocused: string alertContainer: string onAlertContainer: string alertContainerHovered: string - alertContainerPressed: string - alertContainerFocused: string // Error error: string onError: string errorHovered: string - errorPressed: string - errorFocused: string errorContainer: string onErrorContainer: string errorContainerHovered: string - errorContainerPressed: string - errorContainerFocused: string // Info info: string onInfo: string infoHovered: string - infoPressed: string - infoFocused: string infoContainer: string onInfoContainer: string infoContainerHovered: string - infoContainerPressed: string - infoContainerFocused: string // Neutral neutral: string onNeutral: string neutralHovered: string - neutralPressed: string - neutralFocused: string neutralContainer: string onNeutralContainer: string neutralContainerHovered: string - neutralContainerPressed: string - neutralContainerFocused: string // Background background: string onBackground: string @@ -170,16 +128,12 @@ export interface Theme { surface: string onSurface: string surfaceHovered: string - surfacePressed: string - surfaceFocused: string // Surface Inverse surfaceInverse: string onSurfaceInverse: string surfaceInverseHovered: string - surfaceInversePressed: string - surfaceInverseFocused: string // Outline outline: string outlineHigh: string