Skip to content

Commit

Permalink
Merge pull request #3 from GlowTales/setting/#2
Browse files Browse the repository at this point in the history
chore : 나눔스퀘어라운드 글꼴 global style로 적용
  • Loading branch information
gominzip authored Aug 17, 2024
2 parents 908eacd + ba17ed5 commit 6c518c6
Show file tree
Hide file tree
Showing 16 changed files with 103 additions and 88 deletions.
2 changes: 1 addition & 1 deletion index.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<meta charset="UTF-8" />
<link rel="icon" type="image/svg+xml" href="/vite.svg" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>Vite + React + TS</title>
<title>Glow Tales</title>
</head>
<body>
<div id="root"></div>
Expand Down
27 changes: 1 addition & 26 deletions src/App.tsx
Original file line number Diff line number Diff line change
@@ -1,32 +1,7 @@
import { useState } from "react";
import reactLogo from "./assets/react.svg";
import viteLogo from "/vite.svg";

function App() {
const [count, setCount] = useState(0);

return (
<>
<div>
<a href="https://vitejs.dev" target="_blank">
<img src={viteLogo} className="logo" alt="Vite logo" />
</a>
<a href="https://react.dev" target="_blank">
<img src={reactLogo} className="logo react" alt="React logo" />
</a>
</div>
<h1>Vite + React</h1>
<div className="card">
<button onClick={() => setCount((count) => count + 1)}>
count is {count}
</button>
<p>
Edit <code>src/App.tsx</code> and save to test HMR
</p>
</div>
<p className="read-the-docs">
Click on the Vite and React logos to learn more
</p>
<h1>Glow Tales</h1>
</>
);
}
Expand Down
41 changes: 41 additions & 0 deletions src/styles/fonts/NanumSquareRound.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
/* 나눔스퀘어라운드 웹폰트 v1.11 https://github.com/innks/NanumSquareRound */
@font-face {
font-family: NanumSquareRound;
font-style: normal;
font-weight: 300;
font-display: swap;
src: local("NanumSquareRoundL"),
url(./NanumSqueareRound/NanumSquareRoundL.woff2) format("woff2"),
url(./NanumSqueareRound/NanumSquareRoundL.woff) format("woff"),
url(./NanumSqueareRound/NanumSquareRoundL.ttf) format("truetype");
}
@font-face {
font-family: NanumSquareRound;
font-style: normal;
font-weight: 400;
font-display: swap;
src: local("NanumSquareRoundR"),
url(./NanumSqueareRound/NanumSquareRoundR.woff2) format("woff2"),
url(./NanumSqueareRound/NanumSquareRoundR.woff) format("woff"),
url(./NanumSqueareRound/NanumSquareRoundR.ttf) format("truetype");
}
@font-face {
font-family: NanumSquareRound;
font-style: normal;
font-weight: 700;
font-display: swap;
src: local("NanumSquareRoundB"),
url(./NanumSqueareRound/NanumSquareRoundB.woff2) format("woff2"),
url(./NanumSqueareRound/NanumSquareRoundB.woff) format("woff"),
url(./NanumSqueareRound/NanumSquareRoundB.ttf) format("truetype");
}
@font-face {
font-family: NanumSquareRound;
font-style: normal;
font-weight: 800;
font-display: swap;
src: local("NanumSquareRoundEB"),
url(./NanumSqueareRound/NanumSquareRoundEB.woff2) format("woff2"),
url(./NanumSqueareRound/NanumSquareRoundEB.woff) format("woff"),
url(./NanumSqueareRound/NanumSquareRoundEB.ttf) format("truetype");
}
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
121 changes: 60 additions & 61 deletions src/styles/global.css
Original file line number Diff line number Diff line change
@@ -1,66 +1,65 @@
@import "./fonts/NanumSquareRound.css";

html {
-webkit-text-size-adjust: none;
width: 100%;
height: 100%;
margin: 0;
font-size: 62.5%;
overflow: scroll;
scroll-snap-type: y mandatory;
scroll-padding-top: 65px;
scrollbar-width: none;
-ms-overflow-style: none;
display: flex;
justify-content: center;
font-family: "Pretendard";
-webkit-text-size-adjust: none;
width: 100%;
height: 100%;
margin: 0;
font-size: 62.5%;
overflow: scroll;
scroll-snap-type: y mandatory;
scroll-padding-top: 65px;
scrollbar-width: none;
-ms-overflow-style: none;
display: flex;
justify-content: center;
font-family: "NanumSquareRound", sans-serif;
}

html::-webkit-scrollbar {
display: none;
}

body {
display: flex;
flex-direction: column;
align-items: center;
width: 100%;
min-height: 100%; /* 화면 스크롤 방지를 위해 최소높이 지정 */
margin: 0;
padding: 0;
background-color: white;
box-shadow: 10px -50px 50px 15px rgba(220, 220, 220, 0.22),
-10px -50px 50px 15px rgba(197, 197, 197, 0.22);
-webkit-user-select: none;
-moz-user-select: none;
-ms-user-select: none;
user-select: none;
}

/*모바일+아이패드 세로) 화면 너비: 0 ~ 800 */
@media (min-width: 0px) {
html {
font-size: 8px;
}

html::-webkit-scrollbar {
display: none;
}

/* 데스크톱) 화면 너비: 1024 ~ */
@media (min-width: 900px) {
html {
font-size: 10px;
}

body {
width: 100%;
height: fit-content;
/* 화면 스크롤 방지를 위해 최소높이 지정 */
min-height: 100%;
margin: 0;
padding: 0;
background-color: white;
box-shadow: 10px -50px 50px 15px rgba(220, 220, 220, 0.22),
-10px -50px 50px 15px rgba(197, 197, 197, 0.22);
/* 드래그 방지 */
-webkit-user-select: none;
-moz-user-select: none;
-ms-user-select: none;
user-select: none;
width: 768px;
}

/*모바일+아이패드 세로) 화면 너비: 0 ~ 800 */
@media (min-width: 0px) {
html {
font-size: 8px;
}
}

/* 데스크톱) 화면 너비: 1024 ~ */
@media (min-width: 900px) {
html {
font-size: 10px;
}
body {
width: 768px;
}
}

img {
-webkit-user-select: none;
-khtml-user-select: none;
-moz-user-select: none;
-o-user-select: none;
user-select: none;
-webkit-user-drag: none;
-khtml-user-drag: none;
-moz-user-drag: none;
-o-user-drag: none;
}

}

img {
-webkit-user-select: none;
-moz-user-select: none;
-ms-user-select: none;
user-select: none;
-webkit-user-drag: none;
-webkit-user-drag: none;
-moz-user-drag: none;
}

0 comments on commit 6c518c6

Please sign in to comment.