From 950789d1e2a91556eed01f6bc22e4df0139a73d0 Mon Sep 17 00:00:00 2001 From: yougyung Date: Wed, 27 Mar 2024 18:39:07 +0900 Subject: [PATCH 1/3] =?UTF-8?q?fix:=20button=20size=20=EC=A1=B0=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/(sub-page)/layout.tsx | 2 +- app/ui/view/atom/button/button.tsx | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/(sub-page)/layout.tsx b/app/(sub-page)/layout.tsx index 5adad969..92bc14c8 100644 --- a/app/(sub-page)/layout.tsx +++ b/app/(sub-page)/layout.tsx @@ -1,6 +1,6 @@ import Image from 'next/image'; import background from '../../public/assets/background.png'; -import NavigationBar from '../ui/view/molecule/navigation-bar'; + interface LayoutProps { children: React.ReactNode; } diff --git a/app/ui/view/atom/button/button.tsx b/app/ui/view/atom/button/button.tsx index 0b48f78e..9b2a43ad 100644 --- a/app/ui/view/atom/button/button.tsx +++ b/app/ui/view/atom/button/button.tsx @@ -23,10 +23,10 @@ export const ButtonVariants = cva(`flex justify-center items-center`, { }, size: { default: '', - xs: 'px-5 py-3 text-lg font-medium leading-5', - sm: 'px-12 py-3.5 text-sm font-medium leading-3', - md: 'px-6 py-4 text-lg font-medium leading-3', - lg: 'px-32 py-6 text-3xl font-medium leading-9', + xs: 'px-5 py-2.5 text-sm font-medium leading-5', + sm: 'px-10 py-2.5 text-xs font-medium leading-3', + md: 'px-20 py-4 text-md font-medium leading-3', + lg: 'px-28 py-4 text-2xl font-medium leading-9', }, }, }); From b8a1c065b46f992ff0b48abdabd4145cdf5391ee Mon Sep 17 00:00:00 2001 From: SeonghunYang Date: Wed, 27 Mar 2024 14:28:42 +0000 Subject: [PATCH 2/3] feat: Update size prop value in FormSubmitButton component --- app/ui/view/molecule/form/form-submit-button.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/ui/view/molecule/form/form-submit-button.tsx b/app/ui/view/molecule/form/form-submit-button.tsx index 0ea53254..cd3b6a5d 100644 --- a/app/ui/view/molecule/form/form-submit-button.tsx +++ b/app/ui/view/molecule/form/form-submit-button.tsx @@ -15,7 +15,7 @@ export function FormSubmitButton({ label, position = 'right', variant = 'primary', - size = 'sm', + size = 'md', }: FormSubmitButtonProps) { const { formId } = useContext(FormContext); const { pending } = useFormStatus(); From 3f1727ad045df206f479afd8ae54fb2cdc0c4c8f Mon Sep 17 00:00:00 2001 From: yougyung Date: Thu, 28 Mar 2024 21:29:03 +0900 Subject: [PATCH 3/3] =?UTF-8?q?fix:=20md=ED=81=AC=EA=B8=B0=EC=9D=98=20font?= =?UTF-8?q?-size=20=ED=91=9C=EA=B8=B0=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/ui/view/atom/button/button.stories.tsx | 1 - app/ui/view/atom/button/button.tsx | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/app/ui/view/atom/button/button.stories.tsx b/app/ui/view/atom/button/button.stories.tsx index 3e0ed3d7..dbb08050 100644 --- a/app/ui/view/atom/button/button.stories.tsx +++ b/app/ui/view/atom/button/button.stories.tsx @@ -1,4 +1,3 @@ -import React from 'react'; import type { Meta, StoryObj } from '@storybook/react'; import Button from './button'; diff --git a/app/ui/view/atom/button/button.tsx b/app/ui/view/atom/button/button.tsx index 9b2a43ad..e2c00088 100644 --- a/app/ui/view/atom/button/button.tsx +++ b/app/ui/view/atom/button/button.tsx @@ -25,7 +25,7 @@ export const ButtonVariants = cva(`flex justify-center items-center`, { default: '', xs: 'px-5 py-2.5 text-sm font-medium leading-5', sm: 'px-10 py-2.5 text-xs font-medium leading-3', - md: 'px-20 py-4 text-md font-medium leading-3', + md: 'px-20 py-4 text-base font-medium leading-3', lg: 'px-28 py-4 text-2xl font-medium leading-9', }, },