From ee684237681b07032954940980a8afb8682e5ef3 Mon Sep 17 00:00:00 2001 From: Doyun Lee Date: Sat, 20 Jan 2024 05:40:49 +0900 Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=EB=A7=88=EC=9D=B4=ED=8E=98=EC=9D=B4?= =?UTF-8?q?=EC=A7=80=20=EB=A6=AC=EC=8A=A4=ED=8A=B8=20padding=20=EC=A1=B0?= =?UTF-8?q?=EC=A0=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Mypage/components/LecueList/LecueList.style.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Mypage/components/LecueList/LecueList.style.ts b/src/Mypage/components/LecueList/LecueList.style.ts index ef5186a7..18f48387 100644 --- a/src/Mypage/components/LecueList/LecueList.style.ts +++ b/src/Mypage/components/LecueList/LecueList.style.ts @@ -36,7 +36,7 @@ export const ListWrapper = styled.section<{ variant: string }>` width: 100%; height: calc(100dvh - 19.3rem); - padding: 1rem 1rem 1rem 1.5rem; + padding: 1rem; border-radius: ${({ variant }) => (variant === 'note' ? 0 : 0.4)}rem ${({ variant }) => (variant === 'note' ? 0.4 : 0)}rem 0.4rem 0.4rem; From 7b32209f55721bd8a9b2f1d09e3bfea3a473dcbe Mon Sep 17 00:00:00 2001 From: Doyun Lee Date: Sat, 20 Jan 2024 07:06:51 +0900 Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=EC=A7=80=EA=B7=B8=EC=9E=AC=EA=B7=B8?= =?UTF-8?q?=EB=B7=B0=20=EB=AA=A8=EB=8B=AC=20=ED=8F=B0=ED=8A=B8=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Detail/components/BigLecueNote/BigLecueNote.style.ts | 2 +- src/styles/emotion.d.ts | 1 + src/styles/theme.ts | 8 ++++++++ 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/Detail/components/BigLecueNote/BigLecueNote.style.ts b/src/Detail/components/BigLecueNote/BigLecueNote.style.ts index 7ceb8c38..942e3184 100644 --- a/src/Detail/components/BigLecueNote/BigLecueNote.style.ts +++ b/src/Detail/components/BigLecueNote/BigLecueNote.style.ts @@ -42,7 +42,7 @@ export const BigLecueNoteContent = styled.div` width: 100%; max-height: 100%; - ${({ theme }) => theme.fonts.Body1_R_16}; + ${({ theme }) => theme.fonts.Body1_M_16}; `; export const BigLecueNoteDate = styled.p` diff --git a/src/styles/emotion.d.ts b/src/styles/emotion.d.ts index 4827688e..c1451bf5 100644 --- a/src/styles/emotion.d.ts +++ b/src/styles/emotion.d.ts @@ -36,6 +36,7 @@ type fonts = | 'Title1_SB_16' | 'Title2_M_16' | 'Body1_R_16' + | 'Body1_M_16' | 'Body2_M_14' | 'Body3_R_14' | 'Body4_SB_14' diff --git a/src/styles/theme.ts b/src/styles/theme.ts index 61513c28..801f7a21 100644 --- a/src/styles/theme.ts +++ b/src/styles/theme.ts @@ -79,6 +79,14 @@ const fonts = { lineHeight: '150%', letterSpacing: '-0.04rem', }, + Body1_M_16: { + fontFamily: 'Pretendard', + fontStyle: 'normal', + fontWeight: 500, + fontSize: '1.6rem', + lineHeight: '150%', + letterSpacing: '-0.04rem', + }, Body2_M_14: { fontFamily: 'Pretendard', fontStyle: 'normal',