From f393272fd7f6e75e9febe2b759b3f0c70b3f432a Mon Sep 17 00:00:00 2001
From: hanseulhee <3021062@gmail.com>
Date: Sun, 5 May 2024 02:10:00 +0900
Subject: [PATCH] =?UTF-8?q?[#1]=20=ED=8F=B0=ED=8A=B8=20=EB=B0=8F=20?=
=?UTF-8?q?=ED=8F=B4=EB=8D=94=20=EA=B5=AC=EC=A1=B0=20=EB=AA=85=20=EB=B3=80?=
=?UTF-8?q?=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/app/layout.tsx | 6 ++++++
src/assets/{_icons => icons}/.gitkeep | 0
src/assets/{_images => images}/.gitkeep | 0
src/components/{_common => common}/button/.gitkeep | 0
src/components/{_common => common}/checkbox/.gitkeep | 0
src/components/{_common => common}/mypage/card/.gitkeep | 0
src/components/{_common => common}/nav/.gitkeep | 0
src/styles/GlobalStyle.tsx | 8 +-------
8 files changed, 7 insertions(+), 7 deletions(-)
rename src/assets/{_icons => icons}/.gitkeep (100%)
rename src/assets/{_images => images}/.gitkeep (100%)
rename src/components/{_common => common}/button/.gitkeep (100%)
rename src/components/{_common => common}/checkbox/.gitkeep (100%)
rename src/components/{_common => common}/mypage/card/.gitkeep (100%)
rename src/components/{_common => common}/nav/.gitkeep (100%)
diff --git a/src/app/layout.tsx b/src/app/layout.tsx
index c2d3025..7c38fe6 100644
--- a/src/app/layout.tsx
+++ b/src/app/layout.tsx
@@ -20,6 +20,12 @@ const RootLayout = ({
}>) => {
return (
+
+
+
{children}
diff --git a/src/assets/_icons/.gitkeep b/src/assets/icons/.gitkeep
similarity index 100%
rename from src/assets/_icons/.gitkeep
rename to src/assets/icons/.gitkeep
diff --git a/src/assets/_images/.gitkeep b/src/assets/images/.gitkeep
similarity index 100%
rename from src/assets/_images/.gitkeep
rename to src/assets/images/.gitkeep
diff --git a/src/components/_common/button/.gitkeep b/src/components/common/button/.gitkeep
similarity index 100%
rename from src/components/_common/button/.gitkeep
rename to src/components/common/button/.gitkeep
diff --git a/src/components/_common/checkbox/.gitkeep b/src/components/common/checkbox/.gitkeep
similarity index 100%
rename from src/components/_common/checkbox/.gitkeep
rename to src/components/common/checkbox/.gitkeep
diff --git a/src/components/_common/mypage/card/.gitkeep b/src/components/common/mypage/card/.gitkeep
similarity index 100%
rename from src/components/_common/mypage/card/.gitkeep
rename to src/components/common/mypage/card/.gitkeep
diff --git a/src/components/_common/nav/.gitkeep b/src/components/common/nav/.gitkeep
similarity index 100%
rename from src/components/_common/nav/.gitkeep
rename to src/components/common/nav/.gitkeep
diff --git a/src/styles/GlobalStyle.tsx b/src/styles/GlobalStyle.tsx
index 12a9dbf..219d47a 100644
--- a/src/styles/GlobalStyle.tsx
+++ b/src/styles/GlobalStyle.tsx
@@ -2,17 +2,11 @@ import { theme } from '@/styles/theme'
import { createGlobalStyle } from 'styled-components'
const GlobalStyle = createGlobalStyle`
- @font-face {
- font-family: 'Noto Sans KR', sans-serif;
- src: url('https://fonts.googleapis.com/css2?family=Noto+Sans+KR:wght@300;500;700;&family=Song+Myung&display=swap"') format('woff');
- font-style: normal;
- }
-
* {
margin: 0;
padding: 0;
box-sizing: border-box;
- font-family: 'Noto Sans KR', sans-serif;
+ font-family: 'NanumSquare', sans-serif;
&::-webkit-scrollbar {
display: none;