From 22c1e23e3fd2d043bb4fb5a628142eb88d8b1387 Mon Sep 17 00:00:00 2001 From: Joseph Young Date: Sun, 17 Mar 2024 23:19:05 -0500 Subject: [PATCH] Add default style. Colors TBD --- src/components/Menu/Menu.stories.jsx | 6 ++--- src/theme/components/Menu/Menu.theme.js | 2 +- src/theme/components/Menu/MenuFilled.theme.js | 27 +++---------------- src/theme/components/Menu/MenuItem.theme.js | 2 +- 4 files changed, 8 insertions(+), 29 deletions(-) diff --git a/src/components/Menu/Menu.stories.jsx b/src/components/Menu/Menu.stories.jsx index 8cd5aee..f1d64e7 100644 --- a/src/components/Menu/Menu.stories.jsx +++ b/src/components/Menu/Menu.stories.jsx @@ -5,13 +5,13 @@ import { ChevronDownIcon, UserCircleIcon, Cog6ToothIcon, ArrowRightStartOnRectan 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: { diff --git a/src/theme/components/Menu/Menu.theme.js b/src/theme/components/Menu/Menu.theme.js index 8c8e295..c26f846 100644 --- a/src/theme/components/Menu/Menu.theme.js +++ b/src/theme/components/Menu/Menu.theme.js @@ -6,7 +6,7 @@ import divider from "./MenuDivider.theme"; export const menu = { defaultOptions: { - color: 'primary', + color: 'default', radius: 'round', variant: 'solid', }, diff --git a/src/theme/components/Menu/MenuFilled.theme.js b/src/theme/components/Menu/MenuFilled.theme.js index 97f29e3..67eb871 100644 --- a/src/theme/components/Menu/MenuFilled.theme.js +++ b/src/theme/components/Menu/MenuFilled.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' + light: 'bg-white border-gray-6', + dark: 'dark:bg-gray-12 dark:border-gray-10' } } }; diff --git a/src/theme/components/Menu/MenuItem.theme.js b/src/theme/components/Menu/MenuItem.theme.js index c921359..c1b986a 100644 --- a/src/theme/components/Menu/MenuItem.theme.js +++ b/src/theme/components/Menu/MenuItem.theme.js @@ -3,7 +3,7 @@ export const item = { initial: { base: 'flex items-center w-full py-2 px-3 rounded-[inherit] gap-2', disabled: 'disabled:opacity-30 dark:disabled:opacity-40 disabled:hover:!bg-transparent disabled:cursor-not-allowed', - hover: 'hover:bg-[rgba(0,0,0,0.15)] dark:hover:bg-[rgba(0,0,0,0.45)]', + hover: 'hover:bg-black/15 dark:hover:bg-black/45', } } };