Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions web/common/src/components/Button/Button.css
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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);
Expand All @@ -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);
}
2 changes: 1 addition & 1 deletion web/common/src/components/Button/Button.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ export const Button = React.forwardRef<HTMLButtonElement, ButtonProps>(
<Comp
className={cn(
buttonVariants({ variant, size, className }),
disabled && 'pointer-events-none bg-neutral-100 text-neutral-400',
disabled && 'pointer-events-none bg-neutral-150 text-prose',
)}
disabled={disabled}
ref={ref}
Expand Down
3 changes: 0 additions & 3 deletions web/common/src/components/CopyButton/CopyButton.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import React, { useState } from 'react'

import { Button, type ButtonProps } from '@/components/Button/Button'
import { cn } from '@/utils'

type TimerID = ReturnType<typeof setTimeout>

Expand All @@ -20,7 +19,6 @@ export const CopyButton = React.forwardRef<HTMLButtonElement, CopyButtonProps>(
size = 'xs',
delay = 2000,
disabled = false,
className,
children,
onClick,
...props
Expand Down Expand Up @@ -53,7 +51,6 @@ export const CopyButton = React.forwardRef<HTMLButtonElement, CopyButtonProps>(
onClick={copy}
disabled={disabled || !!copied}
{...props}
className={cn(className, copied && 'pointer-events-none')}
>
{children(copied != null)}
</Button>
Expand Down
6 changes: 5 additions & 1 deletion web/common/src/index.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
// 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,
Expand Down
Loading