From fa657404fc392e613c7857f12715a2cdf258ac7f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=84=9C=EC=A0=9C=EA=B2=BD?= Date: Thu, 26 Feb 2026 20:48:58 +0900 Subject: [PATCH 1/8] =?UTF-8?q?refactor:=20index.css=20=ED=8F=B0=ED=8A=B8?= =?UTF-8?q?=20=EB=B0=8F=20=EB=94=94=EC=9E=90=EC=9D=B8=20=EC=8B=9C=EC=8A=A4?= =?UTF-8?q?=ED=85=9C=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/button/Button.stories.tsx | 2 +- src/components/common/button/Button.tsx | 2 +- .../modal/privacyModal/AgreementItem.tsx | 2 +- src/components/workspace/WorkspaceCard.tsx | 2 +- src/index.css | 8 +- src/pages/auth/Signup.tsx | 8 +- src/pages/workspace/Workspace.tsx | 8 +- src/pages/workspace/WorkspaceSetting.tsx | 6 +- src/stories/Typography.stories.tsx | 104 ++++++++++++++++++ 9 files changed, 126 insertions(+), 16 deletions(-) create mode 100644 src/stories/Typography.stories.tsx diff --git a/src/components/common/button/Button.stories.tsx b/src/components/common/button/Button.stories.tsx index 971560d..fedd818 100644 --- a/src/components/common/button/Button.stories.tsx +++ b/src/components/common/button/Button.stories.tsx @@ -66,7 +66,7 @@ export const Sizes: TButtonStory = { export const FullWidth: TButtonStory = { render: () => ( -
+
diff --git a/src/components/common/button/Button.tsx b/src/components/common/button/Button.tsx index f0ac644..9d61a00 100644 --- a/src/components/common/button/Button.tsx +++ b/src/components/common/button/Button.tsx @@ -29,7 +29,7 @@ export default function Button({ ...rest }: IButtonProps) { const sizeClasses = { - big: "h-button-big px-6 rounded-component-md font-heading3 transition-colors duration-normal ease-out", + big: "h-button-big px-6 rounded-component-md font-heading4 transition-colors duration-normal ease-out", small: "h-button-small px-4 rounded-component-sm font-body1 transition-colors duration-normal ease-out", }; diff --git a/src/components/modal/privacyModal/AgreementItem.tsx b/src/components/modal/privacyModal/AgreementItem.tsx index a9d6ef3..5762501 100644 --- a/src/components/modal/privacyModal/AgreementItem.tsx +++ b/src/components/modal/privacyModal/AgreementItem.tsx @@ -13,7 +13,7 @@ type TAgreementItemProps = { const markdownComponents: Components = { h2: ({ ...props }) => (

), diff --git a/src/components/workspace/WorkspaceCard.tsx b/src/components/workspace/WorkspaceCard.tsx index ee83f66..e0f7a9d 100644 --- a/src/components/workspace/WorkspaceCard.tsx +++ b/src/components/workspace/WorkspaceCard.tsx @@ -33,7 +33,7 @@ export default function WorkspaceCard({ workspace: w, menuItems }: TProps) {

-
{w.name}
+
{w.name}
{w.description ?? ""}
diff --git a/src/index.css b/src/index.css index 6f26af0..0641924 100644 --- a/src/index.css +++ b/src/index.css @@ -188,6 +188,12 @@ button { } .font-heading3 { + font-size: 24px; + font-weight: 500; + line-height: 130%; + } + + .font-heading4 { font-size: 18px; font-weight: 400; line-height: 130%; @@ -213,7 +219,7 @@ button { .font-label { font-size: 14px; - font-weight: 700; + font-weight: 600; line-height: 140%; } diff --git a/src/pages/auth/Signup.tsx b/src/pages/auth/Signup.tsx index e1af688..13a9347 100644 --- a/src/pages/auth/Signup.tsx +++ b/src/pages/auth/Signup.tsx @@ -49,7 +49,7 @@ export default function Signup() { variant="gradient" leftIcon={} onClick={() => setStep(1)} - className="font-heading3 shadow-md hover:shadow-lg transition-all" + className="font-heading4 shadow-md hover:shadow-lg transition-all" > 이메일로 시작하기 @@ -60,7 +60,7 @@ export default function Signup() { variant="custom" leftIcon={} onClick={() => handleSocialLogin("google")} - className="bg-white border border-gray-100 text-text-main font-heading3 shadow-sm hover:bg-gray-50" + className="bg-white border border-gray-100 text-text-main font-heading4 shadow-sm hover:bg-gray-50" > 구글 로그인 @@ -71,7 +71,7 @@ export default function Signup() { variant="custom" leftIcon={} onClick={() => handleSocialLogin("kakao")} - className="bg-social-kakao text-text-main font-heading3 shadow-sm hover:opacity-90" + className="bg-social-kakao text-text-main font-heading4 shadow-sm hover:opacity-90" > 카카오 로그인 @@ -82,7 +82,7 @@ export default function Signup() { variant="custom" leftIcon={} onClick={() => handleSocialLogin("naver")} - className="bg-social-naver text-white font-heading3 shadow-sm hover:opacity-90" + className="bg-social-naver text-white font-heading4 shadow-sm hover:opacity-90" > 네이버 로그인 diff --git a/src/pages/workspace/Workspace.tsx b/src/pages/workspace/Workspace.tsx index c2b2625..0b107c1 100644 --- a/src/pages/workspace/Workspace.tsx +++ b/src/pages/workspace/Workspace.tsx @@ -160,15 +160,15 @@ export default function WorkspacePage() { padding="lg" >
-

+

워크스페이스 생성

워크스페이스를 생성한 사용자는 자동으로 관리자 권한을 갖습니다.{" "}
로고 이미지와 기본 정보를 입력해 주세요.

-
-
+
+
diff --git a/src/pages/workspace/WorkspaceSetting.tsx b/src/pages/workspace/WorkspaceSetting.tsx index 051c4b5..f9ffa82 100644 --- a/src/pages/workspace/WorkspaceSetting.tsx +++ b/src/pages/workspace/WorkspaceSetting.tsx @@ -33,7 +33,7 @@ export default function WorkspaceSetting() {

-

기본 정보

+

기본 정보

워크스페이스의 대표적인 정보를 설정합니다.

@@ -78,7 +78,7 @@ export default function WorkspaceSetting() {