Showing
3 changed files
with
11 additions
and
56 deletions
project/ODsay.png
0 → 100644
1.95 KB
... | @@ -461,6 +461,13 @@ iframe{ | ... | @@ -461,6 +461,13 @@ iframe{ |
461 | padding-top: 20px; | 461 | padding-top: 20px; |
462 | } | 462 | } |
463 | 463 | ||
464 | +.odsay{ | ||
465 | + position : relative; | ||
466 | + float:right; | ||
467 | + right:-110px; | ||
468 | + bottom:-285px; | ||
469 | +} | ||
470 | + | ||
464 | .answer-grid-container { | 471 | .answer-grid-container { |
465 | display: grid; | 472 | display: grid; |
466 | margin:30px 30px; | 473 | margin:30px 30px; | ... | ... |
... | @@ -18,12 +18,8 @@ | ... | @@ -18,12 +18,8 @@ |
18 | <script src="../../docs/js/jquery-1.9.1.js"></script> | 18 | <script src="../../docs/js/jquery-1.9.1.js"></script> |
19 | <script type="text/javascript" src="../../docs/js/examples-base.js"></script> | 19 | <script type="text/javascript" src="../../docs/js/examples-base.js"></script> |
20 | <script type="text/javascript" src="../../docs/js/highlight.min.js"></script> | 20 | <script type="text/javascript" src="../../docs/js/highlight.min.js"></script> |
21 | -<<<<<<< HEAD | ||
22 | <script type="text/javascript" | 21 | <script type="text/javascript" |
23 | src="https://openapi.map.naver.com/openapi/v3/maps.js?ncpClientId=rr4owjosjy&submodules=geocoder"></script> | 22 | src="https://openapi.map.naver.com/openapi/v3/maps.js?ncpClientId=rr4owjosjy&submodules=geocoder"></script> |
24 | -======= | ||
25 | - <script type="text/javascript" src="https://openapi.map.naver.com/openapi/v3/maps.js?ncpClientId=rr4owjosjy&submodules=geocoder"></script> | ||
26 | ->>>>>>> 4c7fe1b45bf1746088a811e7fc1b8a9c7172f7cd | ||
27 | <link rel="stylesheet" type="text/css" href="../../docs/css/examples-base.css" /> | 23 | <link rel="stylesheet" type="text/css" href="../../docs/css/examples-base.css" /> |
28 | 24 | ||
29 | <!-- | 25 | <!-- |
... | @@ -94,42 +90,6 @@ | ... | @@ -94,42 +90,6 @@ |
94 | <input type="text" id="end"> | 90 | <input type="text" id="end"> |
95 | </div> | 91 | </div> |
96 | <div class="question-field question-grade">몇학년인가요?</div> | 92 | <div class="question-field question-grade">몇학년인가요?</div> |
97 | -<<<<<<< HEAD | ||
98 | - <div class="input-grade"> | ||
99 | - <div class="custom-select" style="width:208px; margin-right:40px"> | ||
100 | - <select id="semester"> | ||
101 | - <option value="0">1학년 1학기</option> | ||
102 | - <option value="sem-1-1">1학년 1학기</option> | ||
103 | - <option value="sem-1-2">1학년 2학기</option> | ||
104 | - <option value="sem-2-1">2학년 1학기</option> | ||
105 | - <option value="sem-2-2">2학년 2학기</option> | ||
106 | - <option value="sem-3-1">3학년 1학기</option> | ||
107 | - <option value="sem-3-2">3학년 2학기</option> | ||
108 | - <option value="sem-4-1">4학년 1학기</option> | ||
109 | - <option value="sem-4-2">4학년 2학기</option> | ||
110 | - </select> | ||
111 | - </div> | ||
112 | - </div> | ||
113 | - </div> | ||
114 | - <a href="#result" class="text-center tm-down-arrow-link" onclick="semester();return false;"> | ||
115 | - <i class="fas fa-3x fa-caret-down tm-down-arrow">계산해보기</i> | ||
116 | - </a> | ||
117 | - </div> | ||
118 | - </section> | ||
119 | - | ||
120 | - | ||
121 | - <section id="result"> | ||
122 | - <div id="map" style="width:700px;height:300px;"></div> | ||
123 | - <div class="answer-field">한번 갈 때마다 ...<br> | ||
124 | - <span class="answer-highlight">n</span> 시간 | ||
125 | - <span class="answer-highlight">n</span> 분 <br> | ||
126 | - </div> | ||
127 | - <div class="row"> | ||
128 | - <div id="list-answer"> | ||
129 | - <div class="answer-field" id="answer-how-many-hours"> | ||
130 | - 지금까지 <span class="answer-highlight" id="since">?</span>시간을 길에서 보내셨군요<br> | ||
131 | - 졸업까지 앞으로 <span class="answer-highlight" id="until">?</span>시간은 더 길에서 보내시면 됩니다.<br> | ||
132 | -======= | ||
133 | <div class="input-grade"><div class="custom-select" style="width:208px; margin-right:40px"> | 93 | <div class="input-grade"><div class="custom-select" style="width:208px; margin-right:40px"> |
134 | <select> | 94 | <select> |
135 | <option value="0">1학년 1학기</option> | 95 | <option value="0">1학년 1학기</option> |
... | @@ -154,7 +114,9 @@ | ... | @@ -154,7 +114,9 @@ |
154 | 114 | ||
155 | <section id="result"> | 115 | <section id="result"> |
156 | <div class="answer-grid-container"> | 116 | <div class="answer-grid-container"> |
157 | - <div class="map" id="map" style="width:500px;height:300px;""></div> | 117 | + <div class="map" id="map" style="width:500px;height:300px;""> |
118 | + <img class="odsay" src="ODsay.png"> | ||
119 | + </div> | ||
158 | <div class="answer-field" style="width:300px;"><br><br>한번 갈 때마다 ...<br> | 120 | <div class="answer-field" style="width:300px;"><br><br>한번 갈 때마다 ...<br> |
159 | <span class="answer-highlight" id="hour">?</span> 시간 | 121 | <span class="answer-highlight" id="hour">?</span> 시간 |
160 | <span class="answer-highlight" id="min">?</span> 분 <br> | 122 | <span class="answer-highlight" id="min">?</span> 분 <br> |
... | @@ -182,24 +144,10 @@ | ... | @@ -182,24 +144,10 @@ |
182 | <span id = "earth">?</span>바퀴나 돌아요<br><br><br> | 144 | <span id = "earth">?</span>바퀴나 돌아요<br><br><br> |
183 | </div> | 145 | </div> |
184 | </div> | 146 | </div> |
185 | ->>>>>>> 4c7fe1b45bf1746088a811e7fc1b8a9c7172f7cd | ||
186 | </div> | 147 | </div> |
187 | </div> | 148 | </div> |
188 | </div> | 149 | </div> |
189 | - <div class="row"> | 150 | + |
190 | - <div class="answer-detail-question"> | ||
191 | - 이 시간에 알바를 했다면? <br> | ||
192 | - 교통비로 국밥 <br> | ||
193 | - 이 거리라면 에베레스트 등반을 <br> | ||
194 | - 지구를 | ||
195 | - </div> | ||
196 | - <div class="answer-detail-answer"> | ||
197 | - <span id="salary">?</span>원<br> | ||
198 | - <span id="dish">?</span>그릇<br> | ||
199 | - <span id="everest">?</span>번이나...<br> | ||
200 | - <span id="earth">?</span>바퀴나 돌아요<br><br><br> | ||
201 | - </div> | ||
202 | - </div> | ||
203 | <footer class="text-center small tm-footer"> | 151 | <footer class="text-center small tm-footer"> |
204 | <p class="mb-0"> | 152 | <p class="mb-0"> |
205 | Copyright © 2020 TongGilMut | 153 | Copyright © 2020 TongGilMut | ... | ... |
-
Please register or login to post a comment