diff --git a/src/components/Button/Button.stories.tsx b/src/components/Button/Button.stories.tsx index 69b7fcf..bf016f5 100644 --- a/src/components/Button/Button.stories.tsx +++ b/src/components/Button/Button.stories.tsx @@ -10,7 +10,7 @@ const meta: Meta = { title: "Components/Button", decorators: [ MatrixDecorator({ - first: { key: "size", values: ["sm", "md", "lg"] }, + first: { key: "size", values: ["md", "lg"] }, second: { key: "variant", values: ["primary", "secondary"] }, }), ], @@ -77,7 +77,6 @@ export const WalletVariant: Story = { decorators: [ (Story, { args }) => (
-
diff --git a/src/components/Button/Button.tsx b/src/components/Button/Button.tsx index 0c6d0a8..0892d7e 100644 --- a/src/components/Button/Button.tsx +++ b/src/components/Button/Button.tsx @@ -8,7 +8,7 @@ export interface ButtonProps asChild?: boolean; className?: string; variant?: "primary" | "secondary" | "wallet"; - size?: "sm" | "md" | "lg"; + size?: "md" | "lg"; rounded?: "full" | "default"; iconLeft?: React.ReactNode; iconRight?: React.ReactNode; @@ -19,7 +19,7 @@ export const Button: React.FC = ({ className, children, variant = "primary", - size = "sm", + size = "md", rounded = "default", iconLeft, iconRight, @@ -32,8 +32,7 @@ export const Button: React.FC = ({ classNames( "ink:*:object-cover ink:*:w-full ink:*:h-full ink:*:rounded-full", variantClassNames(size, { - sm: "ink:size-4", - md: "ink:size-5", + md: "ink:size-4", lg: "ink:size-6", }) ) @@ -44,14 +43,12 @@ export const Button: React.FC = ({ "ink:rounded-full ink:font-default ink:transition-colors ink:hover:cursor-pointer ink:disabled:cursor-not-allowed ink:transition-default-animation ink:box-border ink:backdrop-blur-xl", "ink:flex ink:items-center ink:justify-center ink:gap-1 ink:shrink-0 ink:select-none ink:no-underline", variantClassNames(size, { - sm: "ink:px-2 ink:py-1.5 ink:text-body-2-bold ink:h-5", - md: "ink:px-3 ink:py-2 ink:text-body-2-bold ink:h-6", - lg: "ink:px-4 ink:py-3 ink:text-h4 ink:h-8", + md: "ink:px-2 ink:py-1.5 ink:text-body-3-bold ink:h-5", + lg: "ink:px-4 ink:py-3 ink:text-h5 ink:h-8", }), variantClassNames(rounded, { full: `ink:rounded-full ${variantClassNames(size, { - sm: "ink:p-1 ink:size-5", - md: "ink:p-1.5 ink:size-6", + md: "ink:p-1 ink:size-5", lg: "ink:p-2 ink:size-8", })}`, default: "", @@ -66,13 +63,11 @@ export const Button: React.FC = ({ "ink:border-background-container ink:border", iconLeft && variantClassNames(size, { - sm: "ink:pl-0.5", md: "ink:pl-0.5", lg: "ink:pl-1", }), iconRight && variantClassNames(size, { - sm: "ink:pr-0.5", md: "ink:pr-0.5", lg: "ink:pr-1", }) diff --git a/src/components/FieldLabel/FieldLabel.tsx b/src/components/FieldLabel/FieldLabel.tsx index b25c74e..73be7ed 100644 --- a/src/components/FieldLabel/FieldLabel.tsx +++ b/src/components/FieldLabel/FieldLabel.tsx @@ -15,13 +15,13 @@ export const FieldLabel: React.FC = ({
{children} -
{description && ( - + {description} )} diff --git a/src/components/Input/Input.tsx b/src/components/Input/Input.tsx index 2bfe05f..49760bb 100644 --- a/src/components/Input/Input.tsx +++ b/src/components/Input/Input.tsx @@ -16,15 +16,15 @@ export const Input = forwardRef(