From 7d25ec94bc940423bee81425b3d347d9e75e5cb1 Mon Sep 17 00:00:00 2001 From: Joseph Young Date: Sun, 17 Mar 2024 22:39:41 -0500 Subject: [PATCH] Add default theme. Colors TBD --- src/components/Card/Card.stories.jsx | 7 ++--- src/theme/components/Card/Card.theme.js | 2 +- .../components/Card/CardContent.theme.js | 18 ++---------- src/theme/components/Card/CardFilled.theme.js | 29 +++---------------- 4 files changed, 11 insertions(+), 45 deletions(-) diff --git a/src/components/Card/Card.stories.jsx b/src/components/Card/Card.stories.jsx index 2d1c894..e9fb2a6 100644 --- a/src/components/Card/Card.stories.jsx +++ b/src/components/Card/Card.stories.jsx @@ -11,13 +11,13 @@ import { useLadleContext } from "@ladle/react"; export default { args: { - color: "primary", + color: "default", radius: "round", }, argTypes: { color: { - defaultValue: 'primary', - options: ['primary', 'secondary', 'tertiary', 'neutral'], + defaultValue: 'default', + options: ['default'], control: { type: 'inline-radio' } }, radius: { @@ -125,6 +125,5 @@ export const CardWithLogin = ({ ...args }) => ( ) CardWithLogin.args = { - color: "tertiary", radius: "round", }; \ No newline at end of file diff --git a/src/theme/components/Card/Card.theme.js b/src/theme/components/Card/Card.theme.js index 323ca9d..829b2d3 100644 --- a/src/theme/components/Card/Card.theme.js +++ b/src/theme/components/Card/Card.theme.js @@ -8,7 +8,7 @@ import section from "./CardSection.theme"; export const card = { defaultOptions: { - color: 'primary', + color: 'default', radius: 'round', variant: 'solid', }, diff --git a/src/theme/components/Card/CardContent.theme.js b/src/theme/components/Card/CardContent.theme.js index 26c3644..00c38ba 100644 --- a/src/theme/components/Card/CardContent.theme.js +++ b/src/theme/components/Card/CardContent.theme.js @@ -7,22 +7,10 @@ export const content = { base: 'm-4', }, variants: { - primary: { - light: 'text-gray-700', - dark: 'dark:text-gray-300', + default: { + light: 'text-gray-10', + dark: 'dark:text-white' }, - secondary: { - light: 'text-secondary-text', - dark: 'dark:text-secondary-50', - }, - tertiary: { - light: 'text-tertiary-text', - dark: 'dark:text-white', - }, - neutral: { - light: 'text-zinc-800', - dark: 'dark:text-neutral-50', - } } } }; diff --git a/src/theme/components/Card/CardFilled.theme.js b/src/theme/components/Card/CardFilled.theme.js index 97f29e3..7896cb2 100644 --- a/src/theme/components/Card/CardFilled.theme.js +++ b/src/theme/components/Card/CardFilled.theme.js @@ -1,30 +1,9 @@ const FilledOptions = { - primary: { + default: { base: { - initial: 'border', - light: 'bg-white border-gray-300', - dark: 'dark:bg-gray-800 dark:border-gray-700' - } - }, - secondary: { - base: { - initial: 'border', - light: 'bg-secondary-50 border-light', - dark: 'dark:bg-zinc-900 dark:border-zinc-800' - } - }, - tertiary: { - base: { - initial: 'border', - light: 'bg-white border-tertiary-200', - dark: 'dark:bg-tertiary-text dark:border-tertiary' - } - }, - neutral: { - base: { - initial: 'border', - light: 'bg-neutral-50 border-neutral-700', - dark: 'dark:bg-neutral-900 dark:border-neutral-800' + initial: 'border bg-transparent', + light: 'border-gray-4', + dark: 'dark:border-gray-10' } } };