From 7ee01689c453721fb4106b74e2cf9265dfc5f48d Mon Sep 17 00:00:00 2001 From: Nate Kelley Date: Sat, 22 Feb 2025 15:20:50 -0700 Subject: [PATCH] disabled update --- web/src/components/ui/buttons/AppButton.stories.tsx | 11 +++++++++++ web/src/components/ui/buttons/AppButton.tsx | 9 +++++---- web/src/styles/tailwind.css | 2 +- 3 files changed, 17 insertions(+), 5 deletions(-) diff --git a/web/src/components/ui/buttons/AppButton.stories.tsx b/web/src/components/ui/buttons/AppButton.stories.tsx index 9d98eb2c6..704f43ec1 100644 --- a/web/src/components/ui/buttons/AppButton.stories.tsx +++ b/web/src/components/ui/buttons/AppButton.stories.tsx @@ -24,6 +24,10 @@ const meta: Meta = { loading: { control: 'boolean', defaultValue: false + }, + selected: { + control: 'boolean', + defaultValue: false } } }; @@ -81,3 +85,10 @@ export const Loading: Story = { loading: true } }; + +export const WithBorder: Story = { + args: { + buttonType: 'default', + size: 'default' + } +}; diff --git a/web/src/components/ui/buttons/AppButton.tsx b/web/src/components/ui/buttons/AppButton.tsx index 279835e7a..2b0dcaba0 100644 --- a/web/src/components/ui/buttons/AppButton.tsx +++ b/web/src/components/ui/buttons/AppButton.tsx @@ -10,7 +10,7 @@ const buttonVariants = cva( variants: { buttonType: { default: - 'bg-white border hover:bg-item-hover disabled:bg-disabled disabled:text-foreground active:bg-item-active data-[selected=true]:bg-disabled', + 'bg-white border hover:bg-item-hover disabled:bg-disabled disabled:text-light-gray active:bg-item-active data-[selected=true]:bg-nav-background', black: 'bg-black text-white hover:bg-black-hover disabled:bg-black-hover', primary: 'bg-primary text-white hover:bg-primary-light ' }, @@ -39,15 +39,16 @@ export interface ButtonProps const AppButton = React.forwardRef( ( { - className, + className = '', buttonType = 'default', - size, + size = 'default', asChild = false, prefix, suffix, children, loading = false, selected = false, + disabled = false, ...props }, ref @@ -57,7 +58,7 @@ const AppButton = React.forwardRef( diff --git a/web/src/styles/tailwind.css b/web/src/styles/tailwind.css index eaaaf9da6..52869f0db 100644 --- a/web/src/styles/tailwind.css +++ b/web/src/styles/tailwind.css @@ -62,7 +62,7 @@ --color-nav-item-hover: #efeeee; --color-nav-item-select: #e6e6e6; --color-ring: hsl(0 0% 3.9%); - --color-disabled: var(--color-nav-background); + --color-disabled: #e6e6e6; /* --color-card: hsl(0 0% 100%); --color-card-foreground: hsl(0 0% 3.9%); */