From 354a39265fce01ee77638622a5e270492449fe2c Mon Sep 17 00:00:00 2001 From: jaeml06 Date: Thu, 25 Jul 2024 17:50:31 +0900 Subject: [PATCH 1/3] =?UTF-8?q?fix:=20font=20=EC=97=90=EB=9F=AC=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/common/font.style.ts | 20 ++++++++++---------- frontend/src/common/reset.style.ts | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/frontend/src/common/font.style.ts b/frontend/src/common/font.style.ts index 4bc9d7025..c3c6f9160 100644 --- a/frontend/src/common/font.style.ts +++ b/frontend/src/common/font.style.ts @@ -12,66 +12,66 @@ import pretendardVariableWoff2 from './assets/fonts/woff2/PretendardVariable.wof const fonts = css` @font-face { - font-family: 'Pretendard'; + font-family: Pretendard; font-weight: 900; font-display: swap; src: url(${pretendardBlackWoff2}) format('woff2'); } @font-face { - font-family: 'Pretendard'; + font-family: Pretendard; font-weight: 800; font-display: swap; src: url(${pretendardExtraBoldWoff2}) format('woff2'); } @font-face { - font-family: 'Pretendard'; + font-family: Pretendard; font-weight: 700; font-display: swap; src: url(${pretendardBoldWoff2}) format('woff2'); } @font-face { - font-family: 'Pretendard'; + font-family: Pretendard; font-weight: 600; font-display: swap; src: url(${pretendardSemiboldWoff2}) format('woff2'); } @font-face { - font-family: 'Pretendard'; + font-family: Pretendard; font-weight: 500; font-display: swap; src: local('Pretendard Medium'), url(${pretendardMediumWoff2}) format('woff2'), - url(./woff-subset/Pretendard-Medium.subset.woff) format('woff'); + url("./woff-subset/Pretendard-Medium.subset.woff") format('woff'); } @font-face { - font-family: 'Pretendard'; + font-family: Pretendard; font-weight: 400; font-display: swap; src: url(${pretendardRegularWoff2}) format('woff2'); } @font-face { - font-family: 'Pretendard'; + font-family: Pretendard; font-weight: 300; font-display: swap; src: url(${pretendardLightWoff2}) format('woff2'); } @font-face { - font-family: 'Pretendard'; + font-family: Pretendard; font-weight: 200; font-display: swap; src: url(${pretendardExtraLightWoff2}) format('woff2'); } @font-face { - font-family: 'Pretendard'; + font-family: Pretendard; font-weight: 100; font-display: swap; src: url(${pretendardThinWoff2}) format('woff2'); diff --git a/frontend/src/common/reset.style.ts b/frontend/src/common/reset.style.ts index 2c30f743c..280eb8fec 100644 --- a/frontend/src/common/reset.style.ts +++ b/frontend/src/common/reset.style.ts @@ -87,7 +87,7 @@ const reset = css` margin: 0; padding: 0; - font-family: Pretendard; + font-family: Pretendard, sans-serif; font-size: 62.5%; vertical-align: baseline; From e35dd9953576507fa7fff2739f113621ef28a98d Mon Sep 17 00:00:00 2001 From: jaeml06 Date: Thu, 25 Jul 2024 17:50:53 +0900 Subject: [PATCH 2/3] =?UTF-8?q?refactor:=20styleLint=20=EC=A0=81=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/MoimDescription/MoimDescription.style.ts | 6 +++++- .../layouts/InformationLayout/InformationLayout.style.ts | 1 + 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/frontend/src/components/MoimDescription/MoimDescription.style.ts b/frontend/src/components/MoimDescription/MoimDescription.style.ts index 7278ac0a0..e7019571a 100644 --- a/frontend/src/components/MoimDescription/MoimDescription.style.ts +++ b/frontend/src/components/MoimDescription/MoimDescription.style.ts @@ -18,7 +18,11 @@ export const titleStyle = css` `; export const descriptionStyle = css` - font-size: 14px; + display: flex; + flex-direction: column; + gap: 10px; + + font-size: 20px; font-weight: 600; color: rgb(255 255 255 / 100%); `; diff --git a/frontend/src/layouts/InformationLayout/InformationLayout.style.ts b/frontend/src/layouts/InformationLayout/InformationLayout.style.ts index 4deb8d519..8a271addc 100644 --- a/frontend/src/layouts/InformationLayout/InformationLayout.style.ts +++ b/frontend/src/layouts/InformationLayout/InformationLayout.style.ts @@ -4,4 +4,5 @@ export const layoutStyle = css` display: flex; flex-direction: column; gap: 10px; + margin-bottom: 100px; `; From 86e6ca2691a198f828a559e4122f802c3ad30a71 Mon Sep 17 00:00:00 2001 From: jaeml06 Date: Thu, 25 Jul 2024 17:52:14 +0900 Subject: [PATCH 3/3] =?UTF-8?q?feat:=20=EB=AA=A8=EC=9E=84=20=EC=B0=B8?= =?UTF-8?q?=EC=97=AC=EC=9E=90=20=EA=B8=80=EC=9E=90=20=ED=81=AC=EA=B8=B0=20?= =?UTF-8?q?=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/pages/MoimDetailPage/MoimDetailPage.tsx | 14 +++++++++++--- .../ParticipationCompletePage.tsx | 11 +++++------ 2 files changed, 16 insertions(+), 9 deletions(-) diff --git a/frontend/src/pages/MoimDetailPage/MoimDetailPage.tsx b/frontend/src/pages/MoimDetailPage/MoimDetailPage.tsx index 746b487e9..0bd382fb8 100644 --- a/frontend/src/pages/MoimDetailPage/MoimDetailPage.tsx +++ b/frontend/src/pages/MoimDetailPage/MoimDetailPage.tsx @@ -11,6 +11,7 @@ import MoimSummary from '@_components/MoimSummary/MoimSummary'; import ROUTES from '@_constants/routes'; import useJoinMoim from '@_hooks/mutaions/useJoinMoim'; import useMoim from '@_hooks/queries/useMoim'; +import { css } from '@emotion/react'; export default function MoimDetailPage() { const navigate = useNavigate(); @@ -42,7 +43,6 @@ export default function MoimDetailPage() { - {moim.description && ( {moim.description} @@ -51,11 +51,19 @@ export default function MoimDetailPage() { {moim.participants && ( {moim.participants.map((nickName) => { - return

{nickName}

; + return ( +
+ {nickName} +
+ ); })} )} -
참여가 완료되었어요!
+ + + - - - - ); }