김윤지 / Probability Death

Go to a project
Toggle navigation Toggle navigation pinning
김윤지
e448dcf2 2 parents 341b9caa fc6b02e3

Merge branch 'master' into 'master' 

폰트 수정



See merge request !6
Inline Side-by-side
Showing 2 changed files with 15 additions and 15 deletions
...@@ -3,8 +3,7 @@ ...@@ -3,8 +3,7 @@
3 3
4 <head> 4 <head>
5 <!-- font --> 5 <!-- font -->
6 - <link href="https://fonts.googleapis.com/css?family=Nanum+Brush+Script&amp;subset=korean" rel="stylesheet" /> 6 + <link href="https://fonts.googleapis.com/css?family=Do+Hyeon&display=swap" rel="stylesheet">
7 - <link href="https://fonts.googleapis.com/css?family=Yeon+Sung&amp;subset=korean" rel="stylesheet" />
8 7
9 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> 8 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
10 <meta name="viewport" content="width=device-width, initial-scale=1" /> 9 <meta name="viewport" content="width=device-width, initial-scale=1" />
...@@ -71,8 +70,8 @@ ...@@ -71,8 +70,8 @@
71 text: "실시간 사망률", 70 text: "실시간 사망률",
72 style: { 71 style: {
73 color: "#FFFFFF", 72 color: "#FFFFFF",
74 - fontWeight: "bold", 73 + //fontWeight: "bold",
75 - fontFamily: 'Yeon Sung', 74 + fontFamily: 'Do Hyeon',
76 fontSize:'32px' 75 fontSize:'32px'
77 } 76 }
78 }, 77 },
...@@ -191,8 +190,8 @@ plotOptions: { ...@@ -191,8 +190,8 @@ plotOptions: {
191 text: "기온", 190 text: "기온",
192 style: { 191 style: {
193 color: "#FFFFFF", 192 color: "#FFFFFF",
194 - fontWeight: "bold", 193 + //fontWeight: "bold",
195 - fontFamily: 'Yeon Sung', 194 + fontFamily: 'Do Hyeon',
196 fontSize:'25px' 195 fontSize:'25px'
197 } 196 }
198 197
...@@ -300,8 +299,8 @@ plotOptions: { ...@@ -300,8 +299,8 @@ plotOptions: {
300 text: "풍속", 299 text: "풍속",
301 style: { 300 style: {
302 color: "#FFFFFF", 301 color: "#FFFFFF",
303 - fontWeight: "bold", 302 + //fontWeight: "bold",
304 - fontFamily: 'Yeon Sung', 303 + fontFamily: 'Do Hyeon',
305 fontSize:'25px' 304 fontSize:'25px'
306 } 305 }
307 }, 306 },
...@@ -408,8 +407,8 @@ plotOptions: { ...@@ -408,8 +407,8 @@ plotOptions: {
408 text: "강수량", 407 text: "강수량",
409 style: { 408 style: {
410 color: "#FFFFFF", 409 color: "#FFFFFF",
411 - fontWeight: "bold", 410 + //fontWeight: "bold",
412 - fontFamily: 'Yeon Sung', 411 + fontFamily: 'Do Hyeon',
413 fontSize:'25px' 412 fontSize:'25px'
414 } 413 }
415 }, 414 },
......
...@@ -9,6 +9,7 @@ ...@@ -9,6 +9,7 @@
9 <!-- font --> 9 <!-- font -->
10 <link href="https://fonts.googleapis.com/css?family=Nanum+Brush+Script&amp;subset=korean" rel="stylesheet"> 10 <link href="https://fonts.googleapis.com/css?family=Nanum+Brush+Script&amp;subset=korean" rel="stylesheet">
11 <link href="https://fonts.googleapis.com/css?family=Yeon+Sung&amp;subset=korean" rel="stylesheet"> 11 <link href="https://fonts.googleapis.com/css?family=Yeon+Sung&amp;subset=korean" rel="stylesheet">
12 +<link href="https://fonts.googleapis.com/css?family=Do+Hyeon&display=swap" rel="stylesheet">
12 13
13 <meta name="viewport" content="width=device-width, initial-scale=1"> 14 <meta name="viewport" content="width=device-width, initial-scale=1">
14 <link rel="stylesheet" type="text/css" media="screen" href="main.css" /> 15 <link rel="stylesheet" type="text/css" media="screen" href="main.css" />
...@@ -25,7 +26,7 @@ ...@@ -25,7 +26,7 @@
25 26
26 <style type="text/css"> 27 <style type="text/css">
27 body { 28 body {
28 - /* background-image: url('background.jpg'); 29 + /* background-image: url('newbackground.png');
29 background-repeat: no-repeat; 30 background-repeat: no-repeat;
30 background-size: cover; */ 31 background-size: cover; */
31 /* background: linear-gradient( to bottom, #fbc2eb, #a6c1ee ); */ 32 /* background: linear-gradient( to bottom, #fbc2eb, #a6c1ee ); */
...@@ -33,13 +34,13 @@ ...@@ -33,13 +34,13 @@
33 34
34 h1 { 35 h1 {
35 color: white; 36 color: white;
36 - font-family: 'Nanum Brush Script', cursive; 37 + font-family: 'Do Hyeon', sans-serif;
37 } 38 }
38 39
39 label { 40 label {
40 color: white; 41 color: white;
41 font-size: 20px; 42 font-size: 20px;
42 - font-family: 'Yeon Sung', cursive; 43 + font-family: 'Do Hyeon', sans-serif;
43 } 44 }
44 #banner { 45 #banner {
45 position: absolute; 46 position: absolute;
...@@ -52,7 +53,7 @@ ...@@ -52,7 +53,7 @@
52 width: 100%; 53 width: 100%;
53 height: 50px; 54 height: 50px;
54 text-align: center; 55 text-align: center;
55 - font-family: 'Yeon Sung', cursive; 56 + font-family: 'Do Hyeon', sans-serif;
56 color:white; 57 color:white;
57 } 58 }
58 </style> 59 </style>
...@@ -75,7 +76,7 @@ ...@@ -75,7 +76,7 @@
75 <label>생년월일</label> 76 <label>생년월일</label>
76 <input type="text" name="birth" class="form-control" placeholder="991025" style="width:200px;"> 77 <input type="text" name="birth" class="form-control" placeholder="991025" style="width:200px;">
77 <br><br><br> 78 <br><br><br>
78 - <input type="submit" value="시작하기" class="btn btn-default" style="font-family: 'Yeon Sung', cursive; width:100px;font-weight: bold; font-size: 18px; background-color: white;"> 79 + <input type="submit" value="시작하기" class="btn btn-default" style="font-family: 'Do Hyeon', cursive; width:100px;font-weight: bold; font-size: 18px; background-color: white;">
79 </div> 80 </div>
80 </form> 81 </form>
81 </div> 82 </div>
......