From ca52d0bcf4355638b234cadb23d0f5cb16f92229 Mon Sep 17 00:00:00 2001 From: caseBread Date: Thu, 2 Mar 2023 23:47:41 +0900 Subject: [PATCH 1/3] =?UTF-8?q?fix=20:=20=EA=B8=80=EC=9E=90=ED=81=AC?= =?UTF-8?q?=EA=B8=B0=20=EB=B0=8F=20=ED=96=89=EA=B0=84=20/=20=EC=9E=90?= =?UTF-8?q?=EA=B0=84=20=EC=88=98=EC=A0=95=20(#115)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/components/TextPreview.tsx | 8 ++++---- frontend/src/styles/TextItem.module.css | 2 +- frontend/src/styles/TextTool.module.css | 6 +++--- frontend/tailwind.config.js | 10 +++++----- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/frontend/src/components/TextPreview.tsx b/frontend/src/components/TextPreview.tsx index e14a63f..19bf011 100644 --- a/frontend/src/components/TextPreview.tsx +++ b/frontend/src/components/TextPreview.tsx @@ -12,12 +12,12 @@ const TextPreview = () => { const third = useRecoilValue(textsAll(2)); const styles = { - container: `w-full h-full grid grid-cols-1 place-content-cneter p-5 overflow-hidden font-bold`, + container: `w-full h-full grid grid-cols-1 place-content-cneter p-5 overflow-hidden tracking-[0.8px] leading-normal`, pos: `flex flex-col ${pos.justifyContent} ${pos.alignItems}`, sub: `flex flex-col w-full ${pos.justifyContent} ${pos.subAlignItems} `, - first: `break-all ${first.fontSize}`, - second: `break-all ${second.fontSize}`, - third: `break-all ${third.fontSize}`, + first: `break-all ${first.fontSize} font-bold`, + second: `break-all ${second.fontSize} font-semibold`, + third: `break-all ${third.fontSize} font-medium`, }; return ( diff --git a/frontend/src/styles/TextItem.module.css b/frontend/src/styles/TextItem.module.css index b7599e6..443b27a 100644 --- a/frontend/src/styles/TextItem.module.css +++ b/frontend/src/styles/TextItem.module.css @@ -3,7 +3,7 @@ background-color: var(--bg-on-surface); padding: 12px 16px; border-radius: 6px; - font-size: 14px; + font-size: 0.875rem; font-weight: 500; box-sizing: border-box; margin: 12px 0; diff --git a/frontend/src/styles/TextTool.module.css b/frontend/src/styles/TextTool.module.css index 370782d..f28d247 100644 --- a/frontend/src/styles/TextTool.module.css +++ b/frontend/src/styles/TextTool.module.css @@ -5,12 +5,12 @@ flex-direction: column; } .title { - font-size: 16px; + font-size: 1rem; font-weight: 700; margin-bottom: 10px; } .subtitle { - font-size: 14px; + font-size: 0.875rem; font-weight: 500; margin-bottom: 12px; } @@ -53,7 +53,7 @@ background-color: var(--bg-on-surface); color: var(--text-active); margin-bottom: 16px; - font-size: 14px; + font-size: 0.875rem; } .selectedCountButton { background-color: var(--bg-input-border-focus); diff --git a/frontend/tailwind.config.js b/frontend/tailwind.config.js index 53508e4..44415cf 100644 --- a/frontend/tailwind.config.js +++ b/frontend/tailwind.config.js @@ -58,11 +58,11 @@ module.exports = { 'always-red': '#FF3040', }, fontSize: { - lg: '21px', - md1: '18px', - md2: '16px', - sm: '14px', - xsm: '12px', + lg: '1.3125rem', + md1: '1.125rem', + md2: '1rem', + sm: '0.875rem', + xsm: '0.75rem', }, borderWidth: { 1: '1px', From 8f0f581cf344e94c88f128ecc18d7c974628d629 Mon Sep 17 00:00:00 2001 From: caseBread Date: Wed, 8 Mar 2023 00:09:24 +0900 Subject: [PATCH 2/3] =?UTF-8?q?feat=20:=20=EA=B8=80=EC=9E=90=20=ED=81=AC?= =?UTF-8?q?=EA=B8=B0=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/atom/textAtom.ts | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/frontend/src/atom/textAtom.ts b/frontend/src/atom/textAtom.ts index 782f5a2..e91ee0b 100644 --- a/frontend/src/atom/textAtom.ts +++ b/frontend/src/atom/textAtom.ts @@ -4,15 +4,15 @@ import { atom, atomFamily } from 'recoil'; export const TEXT_WHITE: RGBColor = { r: 251, g: 251, b: 251, a: 1 }; export const TEXT_BLACK: RGBColor = { r: 10, g: 10, b: 10, a: 1 }; -export const TEXT_LG = 'text-lg'; -export const TEXT_MD = 'text-md2'; -export const TEXT_SM = 'text-sm'; -export type TextSizeType = 'text-lg' | 'text-md1' | 'text-md2' | 'text-sm' | 'text-xsm'; +export const TEXT_LG = 'tablet:text-[34px] text-[21px]'; +export const TEXT_MD = 'tablet:text-[26px] text-[16px]'; +export const TEXT_SM = 'tablet:text-[22px] text-[14px]'; +export type TextSizeType = string; export type TextType = { id: number; content: string; - fontSize: TextSizeType; + fontSize: string; fontColor: RGBColor; }; @@ -32,19 +32,19 @@ const texts: TextType[] = [ { id: 0, content: '제목을 입력하세요.', - fontSize: 'text-lg', + fontSize: 'tablet:text-[34px] text-[21px]', fontColor: TEXT_WHITE, }, { id: 1, content: '내용을 입력하세요.', - fontSize: 'text-md2', + fontSize: 'tablet:text-[26px] text-[16px]', fontColor: TEXT_WHITE, }, { id: 2, content: '내용을 입력하세요.', - fontSize: 'text-sm', + fontSize: 'tablet:text-[22px] text-[14px]', fontColor: TEXT_WHITE, }, ]; From 6cc400afa1fdcfc3129108dd4943624a96cbcf8a Mon Sep 17 00:00:00 2001 From: caseBread Date: Thu, 9 Mar 2023 13:11:08 +0900 Subject: [PATCH 3/3] =?UTF-8?q?fix=20:=20TextSizeType=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/atom/textAtom.ts | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/frontend/src/atom/textAtom.ts b/frontend/src/atom/textAtom.ts index e91ee0b..a233a21 100644 --- a/frontend/src/atom/textAtom.ts +++ b/frontend/src/atom/textAtom.ts @@ -7,7 +7,10 @@ export const TEXT_BLACK: RGBColor = { r: 10, g: 10, b: 10, a: 1 }; export const TEXT_LG = 'tablet:text-[34px] text-[21px]'; export const TEXT_MD = 'tablet:text-[26px] text-[16px]'; export const TEXT_SM = 'tablet:text-[22px] text-[14px]'; -export type TextSizeType = string; +export type TextSizeType = + | 'tablet:text-[34px] text-[21px]' + | 'tablet:text-[26px] text-[16px]' + | 'tablet:text-[22px] text-[14px]'; export type TextType = { id: number;