From 54d2417d19104ee3dd9441db9d42679f26823767 Mon Sep 17 00:00:00 2001 From: plla2 Date: Fri, 10 Jan 2025 10:18:35 +0900 Subject: [PATCH 1/2] =?UTF-8?q?Fix:=20Icon=20COLOR=5FCLASSNAMES=EC=97=90?= =?UTF-8?q?=20grey=EC=B6=94=EA=B0=80,=20arrow=EC=95=84=EC=9D=B4=EC=BD=98?= =?UTF-8?q?=20stroke=EC=97=90=EC=84=9C=20fill=EB=A1=9C=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/components/common/Icon/assets/ArrowNext.tsx | 11 +++++------ .../common/Icon/assets/ArrowNextBlock.tsx | 11 +++++------ src/components/common/Icon/assets/ArrowPrev.tsx | 11 +++++------ .../common/Icon/assets/ArrowPrevBlock.tsx | 11 +++++------ src/components/common/Icon/assets/index.ts | 14 +++++++++----- 5 files changed, 29 insertions(+), 29 deletions(-) diff --git a/src/components/common/Icon/assets/ArrowNext.tsx b/src/components/common/Icon/assets/ArrowNext.tsx index cc3943ee..89b076b2 100644 --- a/src/components/common/Icon/assets/ArrowNext.tsx +++ b/src/components/common/Icon/assets/ArrowNext.tsx @@ -11,16 +11,15 @@ const ArrowNext = ({ width={width} height={height} viewBox='0 0 24 24' - fill='none' xmlns='http://www.w3.org/2000/svg' {...props} > ); diff --git a/src/components/common/Icon/assets/ArrowNextBlock.tsx b/src/components/common/Icon/assets/ArrowNextBlock.tsx index eb5cbbb0..3458db13 100644 --- a/src/components/common/Icon/assets/ArrowNextBlock.tsx +++ b/src/components/common/Icon/assets/ArrowNextBlock.tsx @@ -11,16 +11,15 @@ const ArrowNextBlock = ({ width={width} height={height} viewBox='0 0 24 24' - fill='none' xmlns='http://www.w3.org/2000/svg' {...props} > ); diff --git a/src/components/common/Icon/assets/ArrowPrev.tsx b/src/components/common/Icon/assets/ArrowPrev.tsx index faea712d..eb36ad23 100644 --- a/src/components/common/Icon/assets/ArrowPrev.tsx +++ b/src/components/common/Icon/assets/ArrowPrev.tsx @@ -11,16 +11,15 @@ const ArrowPrev = ({ width={width} height={height} viewBox='0 0 24 24' - fill='none' xmlns='http://www.w3.org/2000/svg' {...props} > ); diff --git a/src/components/common/Icon/assets/ArrowPrevBlock.tsx b/src/components/common/Icon/assets/ArrowPrevBlock.tsx index b7613149..948cc703 100644 --- a/src/components/common/Icon/assets/ArrowPrevBlock.tsx +++ b/src/components/common/Icon/assets/ArrowPrevBlock.tsx @@ -11,16 +11,15 @@ const ArrowPrevBlock = ({ width={width} height={height} viewBox='0 0 24 24' - fill='none' xmlns='http://www.w3.org/2000/svg' {...props} > ); diff --git a/src/components/common/Icon/assets/index.ts b/src/components/common/Icon/assets/index.ts index c51164ca..801e2946 100644 --- a/src/components/common/Icon/assets/index.ts +++ b/src/components/common/Icon/assets/index.ts @@ -33,7 +33,7 @@ type IconMapEntry = { }; type ColorClassNames = { - [group in 'white' | 'dark' | 'red' | 'green' | 'gray']: { + [group in 'white' | 'dark' | 'red' | 'green' | 'gray' | 'grey']: { [shade: number]: string; }; }; @@ -45,10 +45,10 @@ export const iconMap: Record = { plus: { type: 'stroke', file: Plus }, arrowUp: { type: 'stroke', file: Arrowup }, arrowDown: { type: 'stroke', file: ArrowDown }, - arrowPrev: { type: 'stroke', file: ArrowPrev }, - arrowNext: { type: 'stroke', file: ArrowNext }, - arrowPrevBlock: { type: 'stroke', file: ArrowPrevBlock }, - arrowNextBlock: { type: 'stroke', file: ArrowNextBlock }, + arrowPrev: { type: 'fill', file: ArrowPrev }, + arrowNext: { type: 'fill', file: ArrowNext }, + arrowPrevBlock: { type: 'fill', file: ArrowPrevBlock }, + arrowNextBlock: { type: 'fill', file: ArrowNextBlock }, dashboard: { type: 'stroke', file: Dashboard, @@ -147,12 +147,16 @@ const COLOR_CLASSNAMES: ColorClassNames = { 700: 'gray-700', 800: 'gray-800', }, + grey: { + 200: 'grey-200', + }, }; export const COLORS = { // 리디자인 색상 적용 warning: colors.red[500], black: colors.black[100], + grey: colors.grey[200], //--- // 기존 아이콘 색상 white: colors.white[100], From 294331793d2779fd2177a7ea60de8d1400883433 Mon Sep 17 00:00:00 2001 From: plla2 Date: Fri, 10 Jan 2025 10:19:23 +0900 Subject: [PATCH 2/2] =?UTF-8?q?Fix:=20Pagination=20=EC=BB=B4=ED=8F=AC?= =?UTF-8?q?=EB=84=8C=ED=8A=B8=20=EB=A6=AC=EB=94=94=EC=9E=90=EC=9D=B8=20?= =?UTF-8?q?=EC=A0=81=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/Button/Button.variant.tsx | 2 +- src/components/common/Pagination/index.tsx | 32 ++++++++++++++++--- 2 files changed, 28 insertions(+), 6 deletions(-) diff --git a/src/components/common/Button/Button.variant.tsx b/src/components/common/Button/Button.variant.tsx index bd983bc7..eeb74415 100644 --- a/src/components/common/Button/Button.variant.tsx +++ b/src/components/common/Button/Button.variant.tsx @@ -43,7 +43,7 @@ export const buttonVariants = cva( { variant: 'pagination', className: - 'flex w-7 h-7 p-0 cursor-pointer items-center justify-center rounded bg-green-200 text-center text-white-100 hover:bg-green-300 disabled:cursor-default disabled:hover:bg-green-200 active:bg-green-400', + 'flex w-8 h-8 p-0 cursor-pointer items-center justify-center rounded-lg bg-white-100 text-black-100 text-base leading-[1.44] tracking-[-0.008em] font-bold border border-grey-100 hover:bg-grey-100 active:bg-grey-200 disabled:cursor-default disabled:hover:bg-white-100', }, ], }, diff --git a/src/components/common/Pagination/index.tsx b/src/components/common/Pagination/index.tsx index 6da51818..d5d7bf3c 100644 --- a/src/components/common/Pagination/index.tsx +++ b/src/components/common/Pagination/index.tsx @@ -32,7 +32,9 @@ const Pagination = ({ limit, page, setPage, totalPosts }: Props) => { variant={'pagination'} className={cn( '', - page === i + ONE ? 'bg-green-400 hover:bg-green-400' : '', + page === i + ONE + ? 'bg-green-500 text-white-100 hover:bg-green-500' + : '', )} > {i + ONE} @@ -76,14 +78,24 @@ const Pagination = ({ limit, page, setPage, totalPosts }: Props) => { disabled={blockNum === ZERO} variant='pagination' > - + {sliceArr} );