From 0566f3ff708009dc68151d54a1c42bdd0423a34a Mon Sep 17 00:00:00 2001 From: kangminguu <131148077+kangminguu@users.noreply.github.com> Date: Tue, 29 Oct 2024 15:19:11 +0900 Subject: [PATCH] =?UTF-8?q?chore=20:=20=EA=B3=B5=EC=9C=A0-=EC=BB=B4?= =?UTF-8?q?=ED=8F=AC=EB=84=8C=ED=8A=B8-=EB=B2=84=ED=8A=BC-border-radius-?= =?UTF-8?q?=EC=86=8D=EC=84=B1-=EC=B6=94=EA=B0=80=20(#58)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ui/Button/{Button.stories.tsx => Button.stories.ts} | 2 +- src/shared/ui/Button/{Button.styled.tsx => Button.styled.ts} | 2 +- src/shared/ui/Button/Button.tsx | 2 ++ src/shared/ui/Button/Button.types.ts | 5 +++-- 4 files changed, 7 insertions(+), 4 deletions(-) rename src/shared/ui/Button/{Button.stories.tsx => Button.stories.ts} (96%) rename src/shared/ui/Button/{Button.styled.tsx => Button.styled.ts} (95%) diff --git a/src/shared/ui/Button/Button.stories.tsx b/src/shared/ui/Button/Button.stories.ts similarity index 96% rename from src/shared/ui/Button/Button.stories.tsx rename to src/shared/ui/Button/Button.stories.ts index 10499b9..99ca3dd 100644 --- a/src/shared/ui/Button/Button.stories.tsx +++ b/src/shared/ui/Button/Button.stories.ts @@ -1,4 +1,3 @@ -// src/shared/ui/Button/Button.stories.tsx import type { Meta, StoryObj } from '@storybook/react'; import Button from './Button'; @@ -16,6 +15,7 @@ export const Default: Story = { children: '로그인', isActive: true, hasBorder: false, + borderradius: '10px', height: '44px', width: '300px', fontSize: '16px', diff --git a/src/shared/ui/Button/Button.styled.tsx b/src/shared/ui/Button/Button.styled.ts similarity index 95% rename from src/shared/ui/Button/Button.styled.tsx rename to src/shared/ui/Button/Button.styled.ts index 77083d8..a4dafd3 100644 --- a/src/shared/ui/Button/Button.styled.tsx +++ b/src/shared/ui/Button/Button.styled.ts @@ -21,7 +21,7 @@ export const StyledButton = styled.button.withConfig({ font-family: 'Pretendard', sans-serif; height: ${(props) => props.height}; width: ${(props) => props.width}; - border-radius: 10px; + border-radius: ${(props) => props.borderradius}; transition: background-color 0.2s ease; &:hover { diff --git a/src/shared/ui/Button/Button.tsx b/src/shared/ui/Button/Button.tsx index dddd29e..4df9b47 100644 --- a/src/shared/ui/Button/Button.tsx +++ b/src/shared/ui/Button/Button.tsx @@ -6,6 +6,7 @@ const Button = ({ children, isActive = true, hasBorder = false, + borderradius = '10px', height, width, fontSize, @@ -15,6 +16,7 @@ const Button = ({ void;