Merge pull request #52 from Myongji-Graduate/button-resize/#48

Myongji-Graduate · Mar 29, 2024 · 34af5a6 · 34af5a6
2 parents f6e7028 + 3f1727a
commit 34af5a6
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 7 deletions.
diff --git 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.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
@@ -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-base font-medium leading-3',
+      lg: 'px-28 py-4 text-2xl font-medium leading-9',
     },
   },
 });

diff --git 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();