From 0593a1c4957db7a04cd31db25210723302c1e58d Mon Sep 17 00:00:00 2001 From: dave352 Date: Fri, 17 Nov 2023 11:20:17 +0900 Subject: [PATCH 1/9] =?UTF-8?q?fix:=20=EB=94=94=EC=9E=90=EC=9D=B8=EC=8B=9C?= =?UTF-8?q?=EC=8A=A4=ED=85=9C=20theme=20color=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/react-component/src/theme/MusmaProvider/ColorType.ts | 4 ++-- .../react-component/src/theme/MusmaProvider/DefaultTheme.ts | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/react-component/src/theme/MusmaProvider/ColorType.ts b/packages/react-component/src/theme/MusmaProvider/ColorType.ts index 272fb53b..6a1c9cee 100644 --- a/packages/react-component/src/theme/MusmaProvider/ColorType.ts +++ b/packages/react-component/src/theme/MusmaProvider/ColorType.ts @@ -46,7 +46,7 @@ interface DefaultColorSet { } /** * @default - lighter: '#EFE7EB', + lighter: '#DFE7EB', light: '#D9E1E5', main: '#D0D5DD', dark: '#C4D2E0', @@ -78,7 +78,7 @@ interface DefaultColorSet { * @default lighter: '#EDDDDD', light: '#FF4D4F', - main: '#CA3C3D', + main: '#E82717', dark: '#A63132', darker: '#940E0F', */ diff --git a/packages/react-component/src/theme/MusmaProvider/DefaultTheme.ts b/packages/react-component/src/theme/MusmaProvider/DefaultTheme.ts index 55ea345e..11ffa397 100644 --- a/packages/react-component/src/theme/MusmaProvider/DefaultTheme.ts +++ b/packages/react-component/src/theme/MusmaProvider/DefaultTheme.ts @@ -56,14 +56,14 @@ const DefaultTheme: MusmaTheme = { red: { lighter: '#EDDDDD', light: '#FF4D4F', - main: '#CA3C3D', + main: '#E82717', dark: '#A63132', darker: '#940E0F', }, green: { lighter: '#E6E8D8', light: '#00AA52', - main: '#A63132', + main: '#107C41', dark: '#066B36', darker: '#054522', }, From a5c9e662d3c919bd2b2b1b0447c275a7c29d774f Mon Sep 17 00:00:00 2001 From: dave352 Date: Fri, 17 Nov 2023 11:36:16 +0900 Subject: [PATCH 2/9] fix: Typography default color #242E40 --- .../src/components/Typography/Typography.tsx | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/packages/react-component/src/components/Typography/Typography.tsx b/packages/react-component/src/components/Typography/Typography.tsx index 15332f32..34c5f1d6 100644 --- a/packages/react-component/src/components/Typography/Typography.tsx +++ b/packages/react-component/src/components/Typography/Typography.tsx @@ -1,5 +1,7 @@ import { PropsWithChildren } from 'react' +import { useTheme } from '@emotion/react' + import { Body, BodyType, @@ -35,10 +37,13 @@ export type TypographyProps = { */ export const Typography = ({ type, - color, + color: _color, className, children, }: PropsWithChildren) => { + const theme = useTheme() + const color = _color || theme.colors.black.dark + if (type === 'body1' || type === 'body2' || type === 'body3') { return ( From e53f30764b5873ff2158842d202bf904f1cb10c0 Mon Sep 17 00:00:00 2001 From: dave352 Date: Fri, 17 Nov 2023 11:42:01 +0900 Subject: [PATCH 3/9] =?UTF-8?q?fix:=20input=20label=EC=9D=98=20=EC=BB=AC?= =?UTF-8?q?=EB=9F=AC=EB=A5=BC=20=EC=A7=80=EC=A0=95=20#242E40?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../react-component/src/components/InputLabel/InputLabel.tsx | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/react-component/src/components/InputLabel/InputLabel.tsx b/packages/react-component/src/components/InputLabel/InputLabel.tsx index 8d9baec7..b301c580 100644 --- a/packages/react-component/src/components/InputLabel/InputLabel.tsx +++ b/packages/react-component/src/components/InputLabel/InputLabel.tsx @@ -33,6 +33,7 @@ export const InputLabel = memo(