Skip to content

Commit 587b3a1

Browse files
SSSSSSu3834SSSSSSu3834
authored
Merge pull request #1 from SSSSSSu3834/SSSSSSu3834
Sssss su3834
2 parents 5a41a7f + 71ef9ce commit 587b3a1

File tree

14 files changed

+222
-0
lines changed

14 files changed

+222
-0
lines changed

‎src/api/a.txt

Whitespace-only changes.

‎src/assets/a.txt

Whitespace-only changes.

‎src/components/_common/Btn.js

+21
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
const Btn = ({ text, type, onClick }) => {
2+
const btnType = ['deepGreen', 'lightGreen'].includes(type)
3+
? type
4+
: 'default';
5+
//회색 버튼이 default type 안 넣으면 자동 회색 버튼.ㅠ
6+
7+
return (
8+
<button
9+
className={['Btn', `Btn_${btnType}`].join(' ')}
10+
onClick={onClick}
11+
>
12+
{text}
13+
</button>
14+
);
15+
};
16+
17+
Btn.defaultProps = {
18+
type: 'default',
19+
};
20+
21+
export default Btn;

‎src/components/_common/a.txt

Whitespace-only changes.

‎src/components/answerpage/a.txt

Whitespace-only changes.

‎src/components/helppage/a.txt

Whitespace-only changes.

‎src/components/infopage/a.txt

Whitespace-only changes.

‎src/components/loginpage/a.txt

Whitespace-only changes.

‎src/components/mainpage/a.txt

Whitespace-only changes.

‎src/components/mypage/a.txt

Whitespace-only changes.

‎src/components/quizpage/a.txt

Whitespace-only changes.

‎src/pages/MainPage.jsx

+3
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@ const MainPage = () => {
44
return (
55
<>
66
<h1>MainPage</h1>
7+
<p>어쩌구저쩌구</p>
8+
<p style={{ fontFamily: 'GothamBold' }}>D-7</p>
9+
<p style={{ fontFamily: 'NanumBarunpen' }}>어쩌구저쩌구</p>
710
</>
811
);
912
};

‎src/styles/common.css

+198
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
* {
33
margin: 0;
44
padding: 0;
5+
font-family: 'Pretendard-regular';
56
}
67

78
/* PC뷰 설정 */
@@ -24,3 +25,200 @@
2425
--green3: #004029;
2526
--pink: #ff566a;
2627
}
28+
29+
/* font 선언 */
30+
@font-face {
31+
font-family: 'NanumBarunpen';
32+
font-weight: 700;
33+
font-style: normal;
34+
src: url('https://cdn.jsdelivr.net/gh/webfontworld/NanumBarunpen/NanumBarunpen-Bold.eot');
35+
src: url('https://cdn.jsdelivr.net/gh/webfontworld/NanumBarunpen/NanumBarunpen-Bold.eot?#iefix')
36+
format('embedded-opentype'),
37+
url('https://cdn.jsdelivr.net/gh/webfontworld/NanumBarunpen/NanumBarunpen-Bold.woff2')
38+
format('woff2'),
39+
url('https://cdn.jsdelivr.net/gh/webfontworld/NanumBarunpen/NanumBarunpen-Bold.woff')
40+
format('woff'),
41+
url('https://cdn.jsdelivr.net/gh/webfontworld/NanumBarunpen/NanumBarunpen-Bold.ttf')
42+
format('truetype');
43+
font-display: swap;
44+
}
45+
@font-face {
46+
font-family: 'GothamBold';
47+
src: url('./font/GothamBold.ttf') format('woff');
48+
font-weight: normal;
49+
font-style: normal;
50+
}
51+
@font-face {
52+
font-family: 'Pretendard-regular';
53+
font-weight: 100;
54+
font-style: normal;
55+
src: url('https://cdn.jsdelivr.net/gh/webfontworld/pretendard/Pretendard-Thin.eot');
56+
src: url('https://cdn.jsdelivr.net/gh/webfontworld/pretendard/Pretendard-Thin.eot?#iefix')
57+
format('embedded-opentype'),
58+
url('https://cdn.jsdelivr.net/gh/webfontworld/pretendard/Pretendard-Thin.woff2')
59+
format('woff2'),
60+
url('https://cdn.jsdelivr.net/gh/webfontworld/pretendard/Pretendard-Thin.woff')
61+
format('woff'),
62+
url('https://cdn.jsdelivr.net/gh/webfontworld/pretendard/Pretendard-Thin.ttf')
63+
format('truetype');
64+
font-display: swap;
65+
}
66+
@font-face {
67+
font-family: 'Pretendard-regular';
68+
font-weight: 200;
69+
font-style: normal;
70+
src: url('https://cdn.jsdelivr.net/gh/webfontworld/pretendard/Pretendard-ExtraLight.eot');
71+
src: url('https://cdn.jsdelivr.net/gh/webfontworld/pretendard/Pretendard-ExtraLight.eot?#iefix')
72+
format('embedded-opentype'),
73+
url('https://cdn.jsdelivr.net/gh/webfontworld/pretendard/Pretendard-ExtraLight.woff2')
74+
format('woff2'),
75+
url('https://cdn.jsdelivr.net/gh/webfontworld/pretendard/Pretendard-ExtraLight.woff')
76+
format('woff'),
77+
url('https://cdn.jsdelivr.net/gh/webfontworld/pretendard/Pretendard-ExtraLight.ttf')
78+
format('truetype');
79+
font-display: swap;
80+
}
81+
@font-face {
82+
font-family: 'Pretendard-regular';
83+
font-weight: 300;
84+
font-style: normal;
85+
src: url('https://cdn.jsdelivr.net/gh/webfontworld/pretendard/Pretendard-Light.eot');
86+
src: url('https://cdn.jsdelivr.net/gh/webfontworld/pretendard/Pretendard-Light.eot?#iefix')
87+
format('embedded-opentype'),
88+
url('https://cdn.jsdelivr.net/gh/webfontworld/pretendard/Pretendard-Light.woff2')
89+
format('woff2'),
90+
url('https://cdn.jsdelivr.net/gh/webfontworld/pretendard/Pretendard-Light.woff')
91+
format('woff'),
92+
url('https://cdn.jsdelivr.net/gh/webfontworld/pretendard/Pretendard-Light.ttf')
93+
format('truetype');
94+
font-display: swap;
95+
}
96+
@font-face {
97+
font-family: 'Pretendard-regular';
98+
font-weight: 400;
99+
font-style: normal;
100+
src: url('https://cdn.jsdelivr.net/gh/webfontworld/pretendard/Pretendard-Regular.eot');
101+
src: url('https://cdn.jsdelivr.net/gh/webfontworld/pretendard/Pretendard-Regular.eot?#iefix')
102+
format('embedded-opentype'),
103+
url('https://cdn.jsdelivr.net/gh/webfontworld/pretendard/Pretendard-Regular.woff2')
104+
format('woff2'),
105+
url('https://cdn.jsdelivr.net/gh/webfontworld/pretendard/Pretendard-Regular.woff')
106+
format('woff'),
107+
url('https://cdn.jsdelivr.net/gh/webfontworld/pretendard/Pretendard-Regular.ttf')
108+
format('truetype');
109+
font-display: swap;
110+
}
111+
@font-face {
112+
font-family: 'Pretendard-regular';
113+
font-weight: 500;
114+
font-style: normal;
115+
src: url('https://cdn.jsdelivr.net/gh/webfontworld/pretendard/Pretendard-Medium.eot');
116+
src: url('https://cdn.jsdelivr.net/gh/webfontworld/pretendard/Pretendard-Medium.eot?#iefix')
117+
format('embedded-opentype'),
118+
url('https://cdn.jsdelivr.net/gh/webfontworld/pretendard/Pretendard-Medium.woff2')
119+
format('woff2'),
120+
url('https://cdn.jsdelivr.net/gh/webfontworld/pretendard/Pretendard-Medium.woff')
121+
format('woff'),
122+
url('https://cdn.jsdelivr.net/gh/webfontworld/pretendard/Pretendard-Medium.ttf')
123+
format('truetype');
124+
font-display: swap;
125+
}
126+
@font-face {
127+
font-family: 'Pretendard-regular';
128+
font-weight: 600;
129+
font-style: normal;
130+
src: url('https://cdn.jsdelivr.net/gh/webfontworld/pretendard/Pretendard-SemiBold.eot');
131+
src: url('https://cdn.jsdelivr.net/gh/webfontworld/pretendard/Pretendard-SemiBold.eot?#iefix')
132+
format('embedded-opentype'),
133+
url('https://cdn.jsdelivr.net/gh/webfontworld/pretendard/Pretendard-SemiBold.woff2')
134+
format('woff2'),
135+
url('https://cdn.jsdelivr.net/gh/webfontworld/pretendard/Pretendard-SemiBold.woff')
136+
format('woff'),
137+
url('https://cdn.jsdelivr.net/gh/webfontworld/pretendard/Pretendard-SemiBold.ttf')
138+
format('truetype');
139+
font-display: swap;
140+
}
141+
@font-face {
142+
font-family: 'Pretendard-regular';
143+
font-weight: 700;
144+
font-style: normal;
145+
src: url('https://cdn.jsdelivr.net/gh/webfontworld/pretendard/Pretendard-Bold.eot');
146+
src: url('https://cdn.jsdelivr.net/gh/webfontworld/pretendard/Pretendard-Bold.eot?#iefix')
147+
format('embedded-opentype'),
148+
url('https://cdn.jsdelivr.net/gh/webfontworld/pretendard/Pretendard-Bold.woff2')
149+
format('woff2'),
150+
url('https://cdn.jsdelivr.net/gh/webfontworld/pretendard/Pretendard-Bold.woff')
151+
format('woff'),
152+
url('https://cdn.jsdelivr.net/gh/webfontworld/pretendard/Pretendard-Bold.ttf')
153+
format('truetype');
154+
font-display: swap;
155+
}
156+
@font-face {
157+
font-family: 'Pretendard-regular';
158+
font-weight: 800;
159+
font-style: normal;
160+
src: url('https://cdn.jsdelivr.net/gh/webfontworld/pretendard/Pretendard-ExtraBold.eot');
161+
src: url('https://cdn.jsdelivr.net/gh/webfontworld/pretendard/Pretendard-ExtraBold.eot?#iefix')
162+
format('embedded-opentype'),
163+
url('https://cdn.jsdelivr.net/gh/webfontworld/pretendard/Pretendard-ExtraBold.woff2')
164+
format('woff2'),
165+
url('https://cdn.jsdelivr.net/gh/webfontworld/pretendard/Pretendard-ExtraBold.woff')
166+
format('woff'),
167+
url('https://cdn.jsdelivr.net/gh/webfontworld/pretendard/Pretendard-ExtraBold.ttf')
168+
format('truetype');
169+
font-display: swap;
170+
}
171+
@font-face {
172+
font-family: 'Pretendard-regular';
173+
font-weight: 900;
174+
font-style: normal;
175+
src: url('https://cdn.jsdelivr.net/gh/webfontworld/pretendard/Pretendard-Black.eot');
176+
src: url('https://cdn.jsdelivr.net/gh/webfontworld/pretendard/Pretendard-Black.eot?#iefix')
177+
format('embedded-opentype'),
178+
url('https://cdn.jsdelivr.net/gh/webfontworld/pretendard/Pretendard-Black.woff2')
179+
format('woff2'),
180+
url('https://cdn.jsdelivr.net/gh/webfontworld/pretendard/Pretendard-Black.woff')
181+
format('woff'),
182+
url('https://cdn.jsdelivr.net/gh/webfontworld/pretendard/Pretendard-Black.ttf')
183+
format('truetype');
184+
font-display: swap;
185+
}
186+
187+
/* 공용버튼 */
188+
.Btn {
189+
cursor: pointer;
190+
border: none;
191+
border-radius: 8px;
192+
padding: 11px 30px 11px 30px;
193+
font-size: 20px;
194+
white-space: nowrap;
195+
font-family: 'NanumBarunpen';
196+
gap: 12px;
197+
}
198+
.Btn {
199+
/* 화면 너비가 576px 이상일 때 */
200+
padding: 11px calc(30px + (100vw - 576px) / 10);
201+
}
202+
203+
/* 최대 패딩 값을 설정 */
204+
.Btn {
205+
/* 화면 너비가 1200px 이상이면 최대 패딩 값으로 고정 */
206+
@media (min-width: 1200px) {
207+
padding: 11px 90px; /* 최대 패딩 값으로 설정 */
208+
}
209+
}
210+
211+
.Btn_default {
212+
background-color: var(--gray1);
213+
color: black;
214+
}
215+
216+
.Btn_deepGreen {
217+
background-color: var(--green3);
218+
color: white;
219+
}
220+
221+
.Btn_lightGreen {
222+
background-color: #eaf3e7;
223+
color: var(--green3);
224+
}

‎src/styles/font/GothamBold.ttf

44.7 KB
Binary file not shown.

0 commit comments

Comments
 (0)