From 804dfccf40f8f4d4fa677c90413bd161d6699ef4 Mon Sep 17 00:00:00 2001 From: grapefruit Date: Sun, 12 Jan 2025 22:37:52 +0900 Subject: [PATCH 01/10] =?UTF-8?q?fix:=20arrowNext=20=EC=95=84=EC=9D=B4?= =?UTF-8?q?=EC=BD=98=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/common/Icon/assets/ArrowNext.tsx | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/components/common/Icon/assets/ArrowNext.tsx b/src/components/common/Icon/assets/ArrowNext.tsx index 89b076b2..fa3601f9 100644 --- a/src/components/common/Icon/assets/ArrowNext.tsx +++ b/src/components/common/Icon/assets/ArrowNext.tsx @@ -11,15 +11,16 @@ const ArrowNext = ({ width={width} height={height} viewBox='0 0 24 24' + fill='none' xmlns='http://www.w3.org/2000/svg' {...props} > ); From 1ed1e5f182ca9b0379c9a96367073477b75bc374 Mon Sep 17 00:00:00 2001 From: grapefruit Date: Sun, 12 Jan 2025 22:38:08 +0900 Subject: [PATCH 02/10] =?UTF-8?q?fix:=20arrowNext=20stroke=EB=A1=9C=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/components/common/Icon/assets/index.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/common/Icon/assets/index.ts b/src/components/common/Icon/assets/index.ts index 8b7c4ce6..94874348 100644 --- a/src/components/common/Icon/assets/index.ts +++ b/src/components/common/Icon/assets/index.ts @@ -47,7 +47,7 @@ export const iconMap: Record = { arrowUp: { type: 'stroke', file: Arrowup }, arrowDown: { type: 'stroke', file: ArrowDown }, arrowPrev: { type: 'fill', file: ArrowPrev }, - arrowNext: { type: 'fill', file: ArrowNext }, + arrowNext: { type: 'stroke', file: ArrowNext }, arrowPrevBlock: { type: 'fill', file: ArrowPrevBlock }, arrowNextBlock: { type: 'fill', file: ArrowNextBlock }, dashboard: { From f9ed5597847542aa169e9624d91d39b3f503ce03 Mon Sep 17 00:00:00 2001 From: grapefruit Date: Mon, 13 Jan 2025 11:29:25 +0900 Subject: [PATCH 03/10] =?UTF-8?q?fix:=20typography=20=EC=BB=A8=ED=94=8C?= =?UTF-8?q?=EB=A6=AD=ED=8A=B8=20=ED=95=B4=EA=B2=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/common/Typography/index.tsx | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/components/common/Typography/index.tsx b/src/components/common/Typography/index.tsx index 9d32b5d2..20f36154 100644 --- a/src/components/common/Typography/index.tsx +++ b/src/components/common/Typography/index.tsx @@ -43,6 +43,11 @@ export const InfoCardTypo = customTypography('span', { color: 'black', }); +export const Subtitle2Black = customTypography('span', { + type: 'Subtitle2', + color: 'black', +}); + export const Label1White = customTypography('span', { type: 'label1', color: 'white', From 186144f6ffad203274a3f19bd03a54ecbd90379d Mon Sep 17 00:00:00 2001 From: grapefruit Date: Sun, 12 Jan 2025 22:38:42 +0900 Subject: [PATCH 04/10] =?UTF-8?q?feat:=20NavProfile=20=EB=A6=AC=EB=94=94?= =?UTF-8?q?=EC=9E=90=EC=9D=B8=20=EC=A0=81=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/common/NavProfile/index.tsx | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/src/components/common/NavProfile/index.tsx b/src/components/common/NavProfile/index.tsx index d32b50d8..0a389ce5 100644 --- a/src/components/common/NavProfile/index.tsx +++ b/src/components/common/NavProfile/index.tsx @@ -1,17 +1,20 @@ import Badge from '@/components/common/Badge'; import Icon from '@/components/common/Icon'; +import { Subtitle2Black, TableBodyTypo } from '@/components/common/Typography'; const NavProfile = ({ name = '냠냠' }: { name: string }) => { return ( - ); }; From 9aebc4962f389ab5a5c3d87ef8d7a8dbb311c06c Mon Sep 17 00:00:00 2001 From: grapefruit Date: Sun, 12 Jan 2025 22:46:26 +0900 Subject: [PATCH 05/10] =?UTF-8?q?style:=20NavProvile=20w-238px=20=EC=A0=81?= =?UTF-8?q?=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/common/NavProfile/index.tsx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/components/common/NavProfile/index.tsx b/src/components/common/NavProfile/index.tsx index 0a389ce5..1b6dc577 100644 --- a/src/components/common/NavProfile/index.tsx +++ b/src/components/common/NavProfile/index.tsx @@ -4,8 +4,9 @@ import { Subtitle2Black, TableBodyTypo } from '@/components/common/Typography'; const NavProfile = ({ name = '냠냠' }: { name: string }) => { return ( -