Merge branch 'TOP画面追加' into 'master'

TOP画面追加

See merge request !9

src/main/resources/static/css/style.css

@@ -187,7 +187,7 @@ video {
 iframe,embed,object {
     max-width: 100%;
 }
-input,textarea {
+input:not(.logoutBtn),textarea {
     color: #000 !important
 }
 
@@ -1676,4 +1676,8 @@ label {
 
 /* ログイン画面終了 */
 
-
+/* 宮嶋(TOPログアウト) */
+.logoutBtn {
+    color: white;
+    margin-top: 10px;
+}

src/main/resources/templates/index.html

@@ -6,10 +6,10 @@
         <title>Limited</title>
         <meta name="description" content=""/>
         <meta name="viewport" content="width=device-width, initial-scale=1"/>
-        <link rel="icon" href="images/favicon.png"/>
-
-        <link rel="stylesheet" href="css/style.css"/>
-
+      	<link rel="icon" href="images/favicon.png" th:href="@{/images/favicon.png}"/>
+        <link rel="stylesheet" href="css/style.css" th:href="@{/css/style.css}"/>
+		<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-beta/css/bootstrap.min.css" 
+            integrity="sha384-/Y6pD6FV/Vv2HJnA6t+vslU6fwYXjCFtcEpHbNJ0lyAFsXTsjBbfaDjzALeQsN6M" crossorigin="anonymous"/>
         <!--[if lt IE 9]>
             <script src="//html5shiv.googlecode.com/svn/trunk/html5.js"></script>
             <script>window.html5 || document.write('<script src="js/vendor/html5shiv.js"><\/script>')</script>
@@ -105,7 +105,7 @@
                 <!-- Wrapper for slides -->
                 <div class="carousel-inner" role="listbox">
                     <div class="item active">
-                        <img src="images/スニーカー1.jpg" width="1648" height="600" alt=""/>
+                        <img th:src="@{/images/スニーカー1.jpg}" width="1648" height="600" alt=""/>
                         <div class="carousel-caption">
                             <h2>LIMITED SHOES</h2>
                             <h3><Span>SALE SITE</Span></h3>
@@ -113,7 +113,7 @@
                         </div>
                     </div>
                     <div class="item">
-                        <img src="images/スニーカー1.jpg" width="1648" height="600" alt=""/>
+                        <img th:src="@{/images/スニーカー1.jpg}" width="1648" height="600" alt=""/>
                         <div class="carousel-caption">
                             <h2>LIMITED SHOES</h2>
                             <h3><Span>SALE SITE</Span></h3>
@@ -121,7 +121,7 @@
                         </div>
                     </div>
                     <div class="item ">
-                        <img src="images/スニーカー1.jpg" width="1648" height="600" alt=""/>
+                        <img th:src="@{/images/スニーカー1.jpg}" width="1648" height="600" alt=""/>
                         <div class="carousel-caption">
                             <h2>LIMITED SHOES</h2>
                             <h3><Span>SALE SITE</Span></h3>
@@ -243,11 +243,18 @@
         </footer>
 
         <!-- JQUERY -->
-        <script src="js/vendor/jquery-1.11.2.min.js"></script>
-        <script src="js/vendor/bootstrap.min.js"></script>
-        <script src="js/isotope.pkgd.min.js"></script>
-        <script src="js/owl.carousel.min.js"></script>
-        <script src="js/wow.min.js"></script>
-        <script src="js/custom.js"></script>
+        <!-- <script src="js/vendor/jquery-1.11.2.min.js" th:src="@{/js/vendor/jquery-1.11.2.min.js}"></script>
+        <script src="js/vendor/bootstrap.min.js" th:src="@{/js/vendor/bootstrap.min.js}"></script>
+        <script src="js/isotope.pkgd.min.js" th:src="@{/js/isotope.pkgd.min.js}"></script>
+        <script src="js/owl.carousel.min.js" th:src="@{/js/owl.carousel.min.js}"></script>
+        <script src="js/wow.min.js" th:src="@{/js/wow.min.js}"></script>
+        <script src="js/custom.js" th:src="@{/js/custom.js}"></script>-->
+       
+        <script src="https://code.jquery.com/jquery-3.2.1.slim.min.js" 
+            integrity="sha384-KJ3o2DKtIkvYIK3UENzmM7KCkRr/rE9/Qpg6aAZGJwFDMVNA/GpGFF93hXpG5KkN" crossorigin="anonymous"></script>
+        <script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.11.0/umd/popper.min.js"
+            integrity="sha384-b/U6ypiBEHpOf/4+1nzFpr53nxSS+GLCkfwBdFNTxtclqqenISfwAzpKaMNFNmj4" crossorigin="anonymous"></script>
+        <script src="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-beta/js/bootstrap.min.js" 
+            integrity="sha384-h0AbiXch4ZDo7tp9hKZ4TsHbi047NrKGLO3SEJAg45jXxnGIfYzk4Si90RDIqNm1" crossorigin="anonymous"></script>
     </body>
 </html>