Merge remote-tracking branch 'upstream/master' into test1

@@ -209,4 +209,8 @@
     margin-left: auto;
     width: auto;
   }
-}
\ No newline at end of file
+}
+
+.filebox label { display: inline-block; padding: .5em .75em; color: #999; font-size: inherit; line-height: normal; vertical-align: middle; background-color: #fdfdfd; cursor: pointer; border: 1px solid #ebebeb; border-bottom-color: #e2e2e2; border-radius: .25em; }
+
+.filebox input[type="file"] { /* 파일 필드 숨기기 */ position: absolute; width: 1px; height: 1px; padding: 0; margin: -1px; overflow: hidden; clip:rect(0,0,0,0); border: 0; }
\ No newline at end of file

@@ -8,9 +8,13 @@
     <meta name="page_type" content="np-template-header-footer-from-plugin">
     <title>color 1</title>
     <link rel="stylesheet" href="{{ url_for('static', filename='nicepage.css') }}" media="screen">
-<link rel="stylesheet" href="{{ url_for('static', filename='color-1.css') }}" media="screen">
+    <link rel="stylesheet" href="{{ url_for('static', filename='color-1.css') }}" media="screen">
+    <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.1.3/css/bootstrap.min.css">
     <script class="u-script" type="text/javascript" src="{{ url_for('static', filename='jquery.js') }}" defer=""></script>
     <script class="u-script" type="text/javascript" src="{{ url_for('static', filename='nicepage.js') }}" defer=""></script>
+    <script src="https://code.jquery.com/jquery-3.3.1.slim.min.js"></script>
+		<script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.3/umd/popper.min.js"></script>
+		<script src="https://stackpath.bootstrapcdn.com/bootstrap/4.1.3/js/bootstrap.min.js"></script>
     <meta name="generator" content="Nicepage 3.0.9, nicepage.com">
     <link id="u-theme-google-font" rel="stylesheet" href="https://fonts.googleapis.com/css?family=Montserrat:100,100i,200,200i,300,300i,400,400i,500,500i,600,600i,700,700i,800,800i,900,900i|Open+Sans:300,300i,400,400i,600,600i,700,700i,800,800i">
     <link id="u-page-google-font" rel="stylesheet" href="https://fonts.googleapis.com/css?family=Playfair+Display:400,400i,700,700i,900,900i">
@@ -73,11 +77,20 @@
       </div>
     </section>
     <form action="" method="post"  enctype="multipart/form-data">
-      <input type="file", name="img-path">
-      <button type='submit'>Start Test</button>
-  </form>
+      <center>
+        <p>
+          <div class="filebox"> 
+            <label for="ex_file">업로드</label> 
+            <input type="file" name="img-path" id="ex_file">
+          </div>
+        </p>
+        <p>
+          <button class="btn btn-primary btn-lg" type='submit'>Start Test</button>
 
-    
+        </p>
+  
+      </center>
+  </form>
     
     <footer class="u-align-left u-black u-clearfix u-footer u-footer" id="sec-ed9b"><div class="u-clearfix u-sheet u-valign-middle u-sheet-1">
         <blockquote class="u-align-center u-text u-text-default u-text-1">2020-2 Opensource Programming<br>Lee Su Bin &amp; Jo Sue Yeon

@@ -53,7 +53,7 @@
                   <p class="u-align-center u-text u-text-2">openCV 이미지 분석 결과 당신은 쿨톤입니다.<br>
                     <br>
                   </p>
-                  <a href="https://find-your-color.ml/" class="u-btn u-button-style u-hover-palette-1-dark-1 u-palette-1-base u-btn-1">다시 하기</a>
+                  <a href="http://josutest.pythonanywhere.com/" class="u-btn u-button-style u-hover-palette-1-dark-1 u-palette-1-base u-btn-1">다시 하기</a>
                 </div>
               </div>
             </div>

@@ -53,7 +53,7 @@
                   <p class="u-align-center u-text u-text-2">openCV 이미지 분석 결과 당신은 웜톤입니다.<br>
                     <br>
                   </p>
-                  <a href="https://find-your-color.ml/" class="u-btn u-button-style u-hover-palette-1-dark-1 u-palette-1-base u-btn-1">다시 하기</a>
+                  <a href="http://josutest.pythonanywhere.com/" class="u-btn u-button-style u-hover-palette-1-dark-1 u-palette-1-base u-btn-1">다시 하기</a>
                 </div>
               </div>
             </div>