Skip to content

chore(web_common): tweak button styling #5284

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mykalmax merged 2 commits into from
Sep 3, 2025
Merged

chore(web_common): tweak button styling #5284

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9a8c445
tweak button styling
mykalmax Sep 2, 2025
e48c40a
formatting
mykalmax Sep 2, 2025
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
2 changes: 1 addition & 1 deletion web/common/src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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,
Expand Down
Loading