Merge pull request #343 from boostcampwm2023/fe-develop

[FE] 12/14 배포
boostcampwm2023 · Dec 13, 2023 · d0a7a40 · d0a7a40
2 parents 86b8309 + 58472ab
commit d0a7a40
Show file tree

Hide file tree

Showing 52 changed files with 285 additions and 370 deletions.
diff --git a/packages/client/src/app/global.css b/packages/client/src/app/global.css
@@ -37,23 +37,78 @@ body {
 		sans-serif;
 }
 
+button {
+	font-family:
+		Pretendard,
+		-apple-system,
+		BlinkMacSystemFont,
+		system-ui,
+		Roboto,
+		'Helvetica Neue',
+		'Segoe UI',
+		'Apple SD Gothic Neo',
+		'Noto Sans KR',
+		'Malgun Gothic',
+		'Apple Color Emoji',
+		'Segoe UI Emoji',
+		'Segoe UI Symbol',
+		sans-serif;
+}
+
+input {
+	font-family:
+		Pretendard,
+		-apple-system,
+		BlinkMacSystemFont,
+		system-ui,
+		Roboto,
+		'Helvetica Neue',
+		'Segoe UI',
+		'Apple SD Gothic Neo',
+		'Noto Sans KR',
+		'Malgun Gothic',
+		'Apple Color Emoji',
+		'Segoe UI Emoji',
+		'Segoe UI Symbol',
+		sans-serif;
+}
+
+textarea {
+	overflow: hidden;
+	font-family:
+		Pretendard,
+		-apple-system,
+		BlinkMacSystemFont,
+		system-ui,
+		Roboto,
+		'Helvetica Neue',
+		'Segoe UI',
+		'Apple SD Gothic Neo',
+		'Noto Sans KR',
+		'Malgun Gothic',
+		'Apple Color Emoji',
+		'Segoe UI Emoji',
+		'Segoe UI Symbol',
+		sans-serif;
+}
+
 @font-face {
-	font-family: 'pretendard_medium';
+	font-family: 'Pretendard_Medium';
 	src:
-		url('/assets/fonts/Pretendard-Medium.woff2') format('woff2'),
-		url('/assets/fonts/Pretendard-Medium.woff') format('woff'),
-		url('/assets/fonts/Pretendard-Medium.otf') format('otf');
+		url('../assets/fonts/Pretendard-Medium.woff2') format('woff2'),
+		url('../assets/fonts/Pretendard-Medium.woff') format('woff'),
+		url('../assets/fonts/Pretendard-Medium.otf') format('otf');
 	font-display: swap;
 	font-weight: 500;
 	font-style: normal;
 }
 
 @font-face {
-	font-family: 'pretendard_bold';
+	font-family: 'Pretendard_Bold';
 	src:
-		url('/assets/fonts/Pretendard-Bold.woff2') format('woff2'),
-		url('/assets/fonts/Pretendard-Bold.woff') format('woff'),
-		url('/assets/fonts/Pretendard-Bold.otf') format('otf');
+		url('../assets/fonts/Pretendard-Bold.woff2') format('woff2'),
+		url('../assets/fonts/Pretendard-Bold.woff') format('woff'),
+		url('../assets/fonts/Pretendard-Bold.otf') format('otf');
 	font-display: swap;
 	font-weight: 700;
 	font-style: normal;

diff --git a/packages/client/src/assets/favicon.png b/packages/client/src/assets/favicon.png
diff --git a/packages/client/src/assets/icon-add-24-gray.svg b/packages/client/src/assets/icon-add-24-gray.svg
diff --git a/packages/client/src/assets/icon-add-24-white.svg b/packages/client/src/assets/icon-add-24-white.svg
diff --git a/packages/client/src/assets/icon-arrow-left-32-white.svg b/packages/client/src/assets/icon-arrow-left-32-white.svg
diff --git a/packages/client/src/assets/icon-arrow-right-17-white.svg b/packages/client/src/assets/icon-arrow-right-17-white.svg
diff --git a/packages/client/src/assets/icon-arrow-right-32-white.svg b/packages/client/src/assets/icon-arrow-right-32-white.svg
diff --git a/packages/client/src/assets/icon-back-32-white.svg b/packages/client/src/assets/icon-back-32-white.svg
diff --git a/packages/client/src/assets/icon-check-purple.svg b/packages/client/src/assets/icon-check-purple.svg
diff --git a/packages/client/src/assets/icon-confirm-22.svg b/packages/client/src/assets/icon-confirm-22.svg
diff --git a/packages/client/src/assets/icon-eraser-24-active.svg b/packages/client/src/assets/icon-eraser-24-active.svg
diff --git a/packages/client/src/assets/icon-eraser-24-default.svg b/packages/client/src/assets/icon-eraser-24-default.svg
diff --git a/packages/client/src/assets/icon-naver-16-white.svg b/packages/client/src/assets/icon-naver-16-white.svg
diff --git a/packages/client/src/assets/icon-pen-24-active.svg b/packages/client/src/assets/icon-pen-24-active.svg
diff --git a/packages/client/src/assets/icon-pen-24-default.svg b/packages/client/src/assets/icon-pen-24-default.svg
diff --git a/packages/client/src/assets/icon-photo-32-gray.svg b/packages/client/src/assets/icon-photo-32-gray.svg
diff --git a/packages/client/src/assets/icon-planetedit-24-gray.svg b/packages/client/src/assets/icon-planetedit-24-gray.svg
diff --git a/packages/client/src/assets/icon-planetedit-24-white.svg b/packages/client/src/assets/icon-planetedit-24-white.svg
diff --git a/packages/client/src/assets/icon-search-24-white.svg b/packages/client/src/assets/icon-search-24-white.svg
diff --git a/packages/client/src/assets/icon-shuffle-24-gray.svg b/packages/client/src/assets/icon-shuffle-24-gray.svg