diff --git a/index.html b/index.html
index 3c38ff49..14eb6400 100644
--- a/index.html
+++ b/index.html
@@ -2,7 +2,7 @@
-
+
diff --git a/src/components/navBar/bottomNavBar/styles.ts b/src/components/navBar/bottomNavBar/styles.ts
index 356e67b3..d6b05669 100644
--- a/src/components/navBar/bottomNavBar/styles.ts
+++ b/src/components/navBar/bottomNavBar/styles.ts
@@ -15,6 +15,12 @@ export const BottomNavWrapper = styled.div`
max-width: 780px;
margin: 0 auto;
+ padding-left: constant(safe-area-inset-left);
+ padding-right: constant(safe-area-inset-right);
+
+ padding-left: env(safe-area-inset-left);
+ padding-right: env(safe-area-inset-right);
+
user-select: none;
z-index: 999;
diff --git a/src/fonts/Pretendard-Black.woff b/src/fonts/Pretendard-Black.woff
new file mode 100644
index 00000000..d07848c8
Binary files /dev/null and b/src/fonts/Pretendard-Black.woff differ
diff --git a/src/fonts/Pretendard-Bold.woff b/src/fonts/Pretendard-Bold.woff
new file mode 100644
index 00000000..7837ae52
Binary files /dev/null and b/src/fonts/Pretendard-Bold.woff differ
diff --git a/src/fonts/Pretendard-ExtraBold.woff b/src/fonts/Pretendard-ExtraBold.woff
new file mode 100644
index 00000000..8058b761
Binary files /dev/null and b/src/fonts/Pretendard-ExtraBold.woff differ
diff --git a/src/fonts/Pretendard-ExtraLight.woff b/src/fonts/Pretendard-ExtraLight.woff
new file mode 100644
index 00000000..f9498d85
Binary files /dev/null and b/src/fonts/Pretendard-ExtraLight.woff differ
diff --git a/src/fonts/Pretendard-Light.woff b/src/fonts/Pretendard-Light.woff
new file mode 100644
index 00000000..2cad6082
Binary files /dev/null and b/src/fonts/Pretendard-Light.woff differ
diff --git a/src/fonts/Pretendard-Medium.woff b/src/fonts/Pretendard-Medium.woff
new file mode 100644
index 00000000..53704091
Binary files /dev/null and b/src/fonts/Pretendard-Medium.woff differ
diff --git a/src/fonts/Pretendard-Regular.woff b/src/fonts/Pretendard-Regular.woff
new file mode 100644
index 00000000..e3b3a358
Binary files /dev/null and b/src/fonts/Pretendard-Regular.woff differ
diff --git a/src/fonts/Pretendard-SemiBold.woff b/src/fonts/Pretendard-SemiBold.woff
new file mode 100644
index 00000000..682e7a45
Binary files /dev/null and b/src/fonts/Pretendard-SemiBold.woff differ
diff --git a/src/fonts/Pretendard-Thin.woff b/src/fonts/Pretendard-Thin.woff
new file mode 100644
index 00000000..d28e4486
Binary files /dev/null and b/src/fonts/Pretendard-Thin.woff differ
diff --git a/src/styles/fonts.ts b/src/styles/fonts.ts
new file mode 100644
index 00000000..a8247ae3
--- /dev/null
+++ b/src/styles/fonts.ts
@@ -0,0 +1,24 @@
+import { css } from "@emotion/react";
+
+import PretendardRegular from "../fonts/Pretendard-Regular.woff";
+import PretendardBold from "../fonts/Pretendard-Bold.woff";
+
+export const fonts = css`
+ @font-face {
+ font-family: Pretendard;
+ font-style: normal;
+ font-weight: normal;
+ src:
+ local("Pretendard"),
+ url(${PretendardRegular}) format("woff");
+ }
+
+ @font-face {
+ font-family: Pretendard;
+ font-style: normal;
+ font-weight: 500;
+ src:
+ local("Pretendard"),
+ url(${PretendardBold}) format("woff");
+ }
+`;
diff --git a/src/styles/globalStyles.ts b/src/styles/globalStyles.ts
index 0ee05b18..30fee52c 100644
--- a/src/styles/globalStyles.ts
+++ b/src/styles/globalStyles.ts
@@ -1,10 +1,12 @@
import { css } from "@emotion/react";
+import { fonts } from "./fonts";
const globalStyles = css`
* {
margin: 0px;
box-sizing: border-box;
}
+ ${fonts}
::-webkit-scrollbar {
width: 8px;
@@ -43,7 +45,22 @@ const globalStyles = css`
textarea,
label,
table {
- font-family: "Pretendard-Regular";
+ font-family:
+ "Pretendard Variable",
+ 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;
margin: 0;
padding: 0;
border: 0;
@@ -63,7 +80,22 @@ const globalStyles = css`
list-style: none;
}
button {
- font-family: "Pretendard-Regular";
+ font-family:
+ "Pretendard Variable",
+ 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;
border: 0;
background: transparent;
cursor: pointer;
@@ -71,15 +103,22 @@ const globalStyles = css`
margin: 0;
}
input {
- font-family: "Pretendard-Regular";
- }
-
- @font-face {
- font-family: "Pretendard-Regular";
- src: url("https://cdn.jsdelivr.net/gh/Project-Noonnu/noonfonts_2107@1.1/Pretendard-Regular.woff")
- format("woff");
- font-weight: 400;
- font-style: normal;
+ font-family:
+ "Pretendard Variable",
+ 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;
}
`;