김주희 / Probability Death

Go to a project
Toggle navigation Toggle navigation pinning
김주희
1f19f155 2 parents ab7ed828 2a60f128

Merge branch 'design' to 'master'

Expand all
Inline Side-by-side
Showing 2 changed files with 23 additions and 16 deletions
This diff is collapsed. Click to expand it.
1 -<!DOCTYPE <!DOCTYPE html> 1 +<!DOCTYPE
2 +
3 +<!DOCTYPE html>
2 <html> 4 <html>
3 5
4 -<head> 6 + <head>
5 <meta charset="utf-8" /> 7 <meta charset="utf-8" />
6 <meta http-equiv="X-UA-Compatible" content="IE=edge"> 8 <meta http-equiv="X-UA-Compatible" content="IE=edge">
7 <title>Page Title</title> 9 <title>Page Title</title>
...@@ -9,7 +11,7 @@ ...@@ -9,7 +11,7 @@
9 <!-- font --> 11 <!-- font -->
10 <link href="https://fonts.googleapis.com/css?family=Nanum+Brush+Script&amp;subset=korean" rel="stylesheet"> 12 <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"> 13 <link href="https://fonts.googleapis.com/css?family=Yeon+Sung&amp;subset=korean" rel="stylesheet">
12 - 14 + <link href="https://fonts.googleapis.com/css?family=Do+Hyeon&display=swap" rel="stylesheet">
13 <meta name="viewport" content="width=device-width, initial-scale=1"> 15 <meta name="viewport" content="width=device-width, initial-scale=1">
14 <link rel="stylesheet" type="text/css" media="screen" href="main.css" /> 16 <link rel="stylesheet" type="text/css" media="screen" href="main.css" />
15 <script src="main.js"></script> 17 <script src="main.js"></script>
...@@ -42,13 +44,14 @@ ...@@ -42,13 +44,14 @@
42 44
43 h1 { 45 h1 {
44 color: white; 46 color: white;
45 - font-family: 'Nanum Brush Script', cursive; 47 + font-family: 'Do Hyeon', sans-serif;
48 + //font-family: 'Nanum Brush Script', cursive;
46 } 49 }
47 50
48 label { 51 label {
49 color: white; 52 color: white;
50 font-size: 20px; 53 font-size: 20px;
51 - font-family: 'Yeon Sung', cursive; 54 + font-family: 'Do Hyeon', sans-serif;
52 } 55 }
53 56
54 #banner { 57 #banner {
...@@ -63,37 +66,41 @@ ...@@ -63,37 +66,41 @@
63 width: 100%; 66 width: 100%;
64 height: 50px; 67 height: 50px;
65 text-align: center; 68 text-align: center;
66 - font-family: 'Yeon Sung', cursive; 69 + font-family: 'Do Hyeon', sans-serif;
67 color: white; 70 color: white;
68 } 71 }
69 </style> 72 </style>
70 73
71 -</head> 74 + </head>
72 75
73 -<body> 76 + <body>
74 - <img src="images/background.jpg" alt="" style="z-index:-1; min-width: 100%; min-height: 100%"> 77 + <img src="images/newbackground.png" alt="" style="z-index:-1; min-width: 100%; min-height: 100%">
75 <div id="banner"> 78 <div id="banner">
76 <div style="width:100%; text-align: center; padding-top:170px;"> 79 <div style="width:100%; text-align: center; padding-top:170px;">
77 <h1 style="font-size:90px;">당신이 지금 죽을 확률은?</h1> 80 <h1 style="font-size:90px;">당신이 지금 죽을 확률은?</h1>
78 </div> 81 </div>
79 - <br><br><br> 82 + <br>
83 + <br>
84 + <br>
80 <div style="width:100%; text-align: center;"> 85 <div style="width:100%; text-align: center;">
81 <form action="/starting" method="post"> 86 <form action="/starting" method="post">
82 <div class="form-inline"> 87 <div class="form-inline">
83 <label>이름</label> 88 <label>이름</label>
84 - <input type="text" name="name" class="form-control" placeholder="김철수" style="width:200px;"> 89 + <input type="text" name="name" class="form-control" placeholder="조인화" style="width:200px;">
85 &nbsp &nbsp&nbsp&nbsp 90 &nbsp &nbsp&nbsp&nbsp
86 <label>생년월일</label> 91 <label>생년월일</label>
87 - <input type="text" name="birth" class="form-control" placeholder="971009" style="width:200px;"> 92 + <input type="text" name="birth" class="form-control" placeholder="991025" style="width:200px;">
88 - <br><br><br> 93 + <br>
89 - <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;"> 94 + <br>
95 + <br>
96 + <input type="submit" value="시작하기" class="btn btn-default" style="font-family: 'Do Hyeon', sans-serif; width:100px;font-weight: bold; font-size: 18px; background-color: white;">
90 </div> 97 </div>
91 </form> 98 </form>
92 </div> 99 </div>
93 100
94 </div> 101 </div>
95 102
96 - <div id="footer">오픈소스SW개발 조민지 강환석 배희수</div> 103 + <div id="footer">오픈소스SW개발 김주희 김윤지 조인화</div>
97 -</body> 104 + </body>
98 105
99 </html> 106 </html>
...\ No newline at end of file ...\ No newline at end of file
......