From 99a6b90b5163aadeb9e1e4b253116651fbd3b360 Mon Sep 17 00:00:00 2001 From: ShinJongUng <65454966+ShinJongUng@users.noreply.github.com> Date: Sun, 31 Jul 2022 17:32:16 +0900 Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20fix:=20modify=20Fonts=20changes?= =?UTF-8?q?=20(Text=20Component=20&=20Theme)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 피그마 변경 사항 수정 --- src/components/utils/Text/BodyText.tsx | 12 ++++++++ src/components/utils/Text/index.ts | 4 ++- src/styles/Theme.ts | 38 ++++++++++++++++---------- 3 files changed, 39 insertions(+), 15 deletions(-) diff --git a/src/components/utils/Text/BodyText.tsx b/src/components/utils/Text/BodyText.tsx index 1125a7a3..7d4df9e7 100644 --- a/src/components/utils/Text/BodyText.tsx +++ b/src/components/utils/Text/BodyText.tsx @@ -27,3 +27,15 @@ export const BodyText4 = styled.Text({ fontFamily: fonts[3].fontFamily, lineHeight: fonts[3].lineHeight, }); + +export const BodyText5 = styled.Text({ + fontSize: fonts[4].size, + fontFamily: fonts[4].fontFamily, + lineHeight: fonts[4].lineHeight, +}); + +export const BodyText6 = styled.Text({ + fontSize: fonts[5].size, + fontFamily: fonts[5].fontFamily, + lineHeight: fonts[5].lineHeight, +}); diff --git a/src/components/utils/Text/index.ts b/src/components/utils/Text/index.ts index 08f6b17e..a91e120c 100644 --- a/src/components/utils/Text/index.ts +++ b/src/components/utils/Text/index.ts @@ -1,4 +1,4 @@ -import {BodyText1, BodyText2, BodyText3, BodyText4} from './BodyText'; +import {BodyText1, BodyText2, BodyText3, BodyText4, BodyText5, BodyText6} from './BodyText'; import {Headline1, Headline2, Headline3} from './Headline'; import {SubHeadline1, SubHeadline2, SubHeadline3} from './SubHeadline'; @@ -13,4 +13,6 @@ export { BodyText2, BodyText3, BodyText4, + BodyText5, + BodyText6, }; diff --git a/src/styles/Theme.ts b/src/styles/Theme.ts index b9824c4c..bd413b59 100644 --- a/src/styles/Theme.ts +++ b/src/styles/Theme.ts @@ -62,56 +62,66 @@ const theme: Theme = { { size: fontPercentage(28), fontFamily: 'Pretendard-SemiBold', - lineHeight: fontPercentage(28) * 1.28, + lineHeight: fontPercentage(36), }, { size: fontPercentage(24), fontFamily: 'Pretendard-SemiBold', - lineHeight: fontPercentage(24) * 1.3, + lineHeight: fontPercentage(32), }, { size: fontPercentage(22), fontFamily: 'Pretendard-SemiBold', - lineHeight: fontPercentage(22) * 1.3, + lineHeight: fontPercentage(30), }, ], SubHeadline: [ { size: fontPercentage(20), - fontFamily: 'Pretendard-Medium', - lineHeight: fontPercentage(20) * 1.3, + fontFamily: 'Pretendard-SemiBold', + lineHeight: fontPercentage(28), }, { size: fontPercentage(18), - fontFamily: 'Pretendard-Medium', - lineHeight: fontPercentage(18) * 1.36, + fontFamily: 'Pretendard-SemiBold', + lineHeight: fontPercentage(24), }, { - size: fontPercentage(14), - fontFamily: 'Pretendard-Medium', - lineHeight: fontPercentage(14) * 1.36, + size: fontPercentage(16), + fontFamily: 'Pretendard-SemiBold', + lineHeight: fontPercentage(20), }, ], Body: [ { size: fontPercentage(16), fontFamily: 'Pretendard-Medium', - lineHeight: fontPercentage(16) * 1.36, + lineHeight: fontPercentage(22), }, { size: fontPercentage(16), fontFamily: 'Pretendard-Regular', - lineHeight: fontPercentage(16) * 1.36, + lineHeight: fontPercentage(22), + }, + { + size: fontPercentage(14), + fontFamily: 'Pretendard-Medium', + lineHeight: fontPercentage(20), }, { size: fontPercentage(14), fontFamily: 'Pretendard-Regular', - lineHeight: fontPercentage(14) * 1.4, + lineHeight: fontPercentage(20), + }, + { + size: fontPercentage(12), + fontFamily: 'Pretendard-Medium', + lineHeight: fontPercentage(18), }, { size: fontPercentage(12), fontFamily: 'Pretendard-Regular', - lineHeight: fontPercentage(12) * 1.4, + lineHeight: fontPercentage(18), }, ], },