From 9a8c445771d7225cd0a09480f1393b54077a6231 Mon Sep 17 00:00:00 2001 From: Max Mykal Date: Tue, 2 Sep 2025 16:33:13 -0700 Subject: [PATCH 1/2] tweak button styling --- web/common/src/components/Button/Button.css | 8 ++++---- web/common/src/components/Button/Button.tsx | 2 +- web/common/src/components/CopyButton/CopyButton.tsx | 3 --- web/common/src/index.ts | 2 +- 4 files changed, 6 insertions(+), 9 deletions(-) diff --git a/web/common/src/components/Button/Button.css b/web/common/src/components/Button/Button.css index 339c14675b..7e8b856bf3 100644 --- a/web/common/src/components/Button/Button.css +++ b/web/common/src/components/Button/Button.css @@ -4,7 +4,7 @@ --color-button-primary-hover: var(--color-action-hover); --color-button-primary-active: var(--color-action-active); - --color-button-secondary-background: var(--color-neutral-100); + --color-button-secondary-background: var(--color-neutral-10); --color-button-secondary-foreground: var(--color-prose); --color-button-secondary-hover: var(--color-neutral-125); --color-button-secondary-active: var(--color-neutral-150); @@ -14,7 +14,7 @@ --color-button-alternative-hover: var(--color-neutral-125); --color-button-alternative-active: var(--color-neutral-150); - --color-button-destructive-background: var(--color-neutral-100); + --color-button-destructive-background: var(--color-neutral-10); --color-button-destructive-foreground: var(--color-destructive-foreground); --color-button-destructive-hover: var(--color-neutral-125); --color-button-destructive-active: var(--color-neutral-150); @@ -26,6 +26,6 @@ --color-button-transparent-background: transparent; --color-button-transparent-foreground: var(--color-prose); - --color-button-secondary-hover: var(--color-neutral-125); - --color-button-secondary-active: var(--color-neutral-150); + --color-button-transparent-hover: var(--color-neutral-125); + --color-button-transparent-active: var(--color-neutral-150); } diff --git a/web/common/src/components/Button/Button.tsx b/web/common/src/components/Button/Button.tsx index 46f9c8cf1b..e4bebd0798 100644 --- a/web/common/src/components/Button/Button.tsx +++ b/web/common/src/components/Button/Button.tsx @@ -30,7 +30,7 @@ export const Button = React.forwardRef( @@ -20,7 +19,6 @@ export const CopyButton = React.forwardRef( size = 'xs', delay = 2000, disabled = false, - className, children, onClick, ...props @@ -53,7 +51,6 @@ export const CopyButton = React.forwardRef( onClick={copy} disabled={disabled || !!copied} {...props} - className={cn(className, copied && 'pointer-events-none')} > {children(copied != null)} diff --git a/web/common/src/index.ts b/web/common/src/index.ts index 6cd52abead..fcbb022f15 100644 --- a/web/common/src/index.ts +++ b/web/common/src/index.ts @@ -1,6 +1,6 @@ // Components export { Badge, type BadgeProps } from '@/components/Badge/Badge' -export { Button, type ButtonProps } from '@/components/Button/Button' +export { Button, type ButtonProps, type ButtonVariant } from '@/components/Button/Button' export { CopyButton, type CopyButtonProps, From e48c40a40009c97404729402ae27e6f51e905bcf Mon Sep 17 00:00:00 2001 From: Max Mykal Date: Tue, 2 Sep 2025 16:58:50 -0700 Subject: [PATCH 2/2] formatting --- web/common/src/index.ts | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/web/common/src/index.ts b/web/common/src/index.ts index fcbb022f15..dce05a9c83 100644 --- a/web/common/src/index.ts +++ b/web/common/src/index.ts @@ -1,6 +1,10 @@ // Components export { Badge, type BadgeProps } from '@/components/Badge/Badge' -export { Button, type ButtonProps, type ButtonVariant } from '@/components/Button/Button' +export { + Button, + type ButtonProps, + type ButtonVariant, +} from '@/components/Button/Button' export { CopyButton, type CopyButtonProps,