From b419cf4e6059eb4c9f140751334605d45f8faec9 Mon Sep 17 00:00:00 2001 From: navyjeongs Date: Mon, 29 Jan 2024 18:16:48 +0900 Subject: [PATCH 1/3] =?UTF-8?q?Design:=20=EB=AA=A8=EB=8B=AC=20=EB=B0=B0?= =?UTF-8?q?=EA=B2=BD=EC=83=89=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/@types/emotion.d.ts | 1 + src/styles/ThemeStyle.tsx | 3 +++ 2 files changed, 4 insertions(+) diff --git a/src/@types/emotion.d.ts b/src/@types/emotion.d.ts index 40f0e21..00867d6 100644 --- a/src/@types/emotion.d.ts +++ b/src/@types/emotion.d.ts @@ -13,5 +13,6 @@ declare module '@emotion/react' { green: string; white: string; gray: string; + 'modal-bg': string; } } diff --git a/src/styles/ThemeStyle.tsx b/src/styles/ThemeStyle.tsx index 3d75aa8..b93dce0 100644 --- a/src/styles/ThemeStyle.tsx +++ b/src/styles/ThemeStyle.tsx @@ -10,6 +10,7 @@ interface Theme { green: string; white: string; gray: string; + 'modal-bg': string; } interface Themes { @@ -30,6 +31,7 @@ const themes: Themes = { green: '#31b65b', white: '#ffffff', gray: '#aaaaaa', + 'modal-bg': '#d9d9d9a1', }, dark: { @@ -44,6 +46,7 @@ const themes: Themes = { green: '#31b65b', white: '#ffffff', gray: '#aaaaaa', + 'modal-bg': '#060505a1', }, }; From 3b88ddfdd801be33d50c807f8d093898857cf2c8 Mon Sep 17 00:00:00 2001 From: navyjeongs Date: Mon, 29 Jan 2024 18:18:09 +0900 Subject: [PATCH 2/3] =?UTF-8?q?Design:=20=EA=B8=B0=EB=B3=B8=20=EC=83=89?= =?UTF-8?q?=EC=83=81=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Card/HomeCard.tsx | 3 ++- src/components/Modal/index.tsx | 6 +++--- src/components/layout.tsx | 1 + 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/components/Card/HomeCard.tsx b/src/components/Card/HomeCard.tsx index 80ecd54..3ab1260 100644 --- a/src/components/Card/HomeCard.tsx +++ b/src/components/Card/HomeCard.tsx @@ -21,7 +21,8 @@ const Container = styled.div<{ hasOnClick: boolean }>` display: flex; align-items: center; text-align: center; - background-color: white; + background-color: ${({ theme }) => theme.text}; + color: ${({ theme }) => theme.bg}; border-radius: 1rem; font-size: 1.6rem; justify-content: center; diff --git a/src/components/Modal/index.tsx b/src/components/Modal/index.tsx index dc43caf..86d2721 100644 --- a/src/components/Modal/index.tsx +++ b/src/components/Modal/index.tsx @@ -36,13 +36,13 @@ const Container = styled.div` display: flex; justify-content: center; align-items: center; - background-color: ${({ theme }) => theme['bg-70']}; - opacity: 0.8; + background-color: ${({ theme }) => theme['modal-bg']}; + color: ${({ theme }) => theme.text}; z-index: 10; `; const ModalContent = styled.div` - background-color: ${({ theme }) => theme['bg-100']}; + background-color: ${({ theme }) => theme.bg}; border-radius: 2rem; text-align: center; margin: 0 auto; diff --git a/src/components/layout.tsx b/src/components/layout.tsx index def9ffc..861bbab 100644 --- a/src/components/layout.tsx +++ b/src/components/layout.tsx @@ -60,6 +60,7 @@ const Layout = ({ children }: PropsWithChildren) => { const AuthLayout = styled.div` padding: 2rem; + color: ${({ theme }) => theme.text}; background-color: ${({ theme }) => theme.bg}; `; From 8e88b355851b6cd06d5197d7fceba0826dbcbe39 Mon Sep 17 00:00:00 2001 From: navyjeongs Date: Mon, 29 Jan 2024 18:22:40 +0900 Subject: [PATCH 3/3] =?UTF-8?q?Design:=20=EA=B8=B0=EB=B3=B8=20=EA=B8=80?= =?UTF-8?q?=EC=94=A8=20=EC=83=89=20=EC=A7=80=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/index.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/index.tsx b/src/pages/index.tsx index 02d0015..8af8afc 100644 --- a/src/pages/index.tsx +++ b/src/pages/index.tsx @@ -60,6 +60,6 @@ const ItemIndex = styled.div` width: 3rem; `; const ItemLink = styled.a` - color: black; + color: ${({ theme }) => theme.text}; text-decoration: none; `;