Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix: 아이폰 뷰포트 대응 & 웹 폰트 통일 #248

Merged
merged 2 commits into from
Jan 30, 2024
Merged

Fix: 아이폰 뷰포트 대응 & 웹 폰트 통일 #248

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6d3e2f9
Fix: 아이폰 하단 바 반응형 대응
Jan 30, 2024
3632f33
Fix: 웹 폰트 설치
Jan 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<html lang="en">
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<meta name="viewport" content="initial-scale=1, viewport-fit=cover" />
<link rel="manifest" href="/manifest.json" />
<link rel="icon" href="/favicon.ico" />
<link rel="apple-touch-icon" href="/apple-touch-icon-180x180.png" sizes="180x180" />
Expand Down
6 changes: 6 additions & 0 deletions src/components/navBar/bottomNavBar/styles.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Binary file added src/fonts/Pretendard-Black.woff
View file
Open in desktop
Binary file not shown.
Binary file added src/fonts/Pretendard-Bold.woff
View file
Open in desktop
Binary file not shown.
Binary file added src/fonts/Pretendard-ExtraBold.woff
View file
Open in desktop
Binary file not shown.
Binary file added src/fonts/Pretendard-ExtraLight.woff
View file
Open in desktop
Binary file not shown.
Binary file added src/fonts/Pretendard-Light.woff
View file
Open in desktop
Binary file not shown.
Binary file added src/fonts/Pretendard-Medium.woff
View file
Open in desktop
Binary file not shown.
Binary file added src/fonts/Pretendard-Regular.woff
View file
Open in desktop
Binary file not shown.
Binary file added src/fonts/Pretendard-SemiBold.woff
View file
Open in desktop
Binary file not shown.
Binary file added src/fonts/Pretendard-Thin.woff
View file
Open in desktop
Binary file not shown.
24 changes: 24 additions & 0 deletions src/styles/fonts.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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");
}
`;
61 changes: 50 additions & 11 deletions src/styles/globalStyles.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down Expand Up @@ -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;
Expand All @@ -63,23 +80,45 @@ 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;
padding: 0;
margin: 0;
}
input {
font-family: "Pretendard-Regular";
}
@font-face {
font-family: "Pretendard-Regular";
src: url("https://cdn.jsdelivr.net/gh/Project-Noonnu/[email protected]/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;
}
`;

Expand Down
Loading