Merge branch 'ログイン画面デザイン' into 'master'

ログイン画面デザイン完成

See merge request !4

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

@@ -187,8 +187,7 @@ video {
 iframe,embed,object {
     max-width: 100%;
 }
-/* //宮嶋追記(TOPでのログアウトボタン) */
-input:not(.logoutBtn),textarea {
+input,textarea {
     color: #000 !important
 }
 
@@ -1558,47 +1557,123 @@ label {
 
 /* フォームの幅 */
 .login {
-    width: 300px;
+    width: 400px;
     height: 30px;
 }
 
 /* フォームを中央寄せなど */
-#loginForm {
+#login-form {
     text-align: center;
     margin: 100px 0 150px;
 }
 
 /* 案内テキスト */
-#onlineShoeStore {
+#online-shoe-store {
     font-size: 40px;
     text-align: center;
     margin-top: 100px;
 }
 
-#onlineShoeStoreSpan {
+#online-shoe-store-span {
     border-bottom: 2px solid #1abc9c;
 }
 
 /* フォーム間隔 */
-#emailForm, #passwordForm {
+#email-form, #password-form {
     margin: 20px 0;
 }
 
-/* 送信ボタン */
-#btn, #signUp{
+/* 送信ボタン 会員登録ボタン */
+#btn, #sign-up{
     width: 150px;
     height: 50px;
     margin-top: 50px;
     margin-left: 20px;
-    font-weight: bold; 
+    font-weight: bold;
+    background-color: #1abc9c;
+    border-radius: 3px;
+    border:none;
+    color: #000;
 }
 
-/* ログイン画面終了 */
+/* モーダル */
+.content{
+    margin: 0 auto;
+    padding: 40px;
+}
+.modal{
+    display: none;
+    height: 100vh;
+    position: fixed;
+    top: 0;
+    width: 100%;
+}
+.modal__bg{
+    background: rgba(0,0,0,0.8);
+    height: 100vh;
+    position: absolute;
+    width: 100%;
+}
+.modal__content{
+    background: #fff;
+    left: 50%;
+    padding: 40px;
+    position: absolute;
+    top: 50%;
+    transform: translate(-50%,-50%);
+    width: 60%;
+}
+
+/* モーダル内フォーム */
+.sign-up-form-input {
+    width: 400px;
+    height: 30px;
+}
 
+.sign-up-form-label {
+    width: 150px;
+    color: #000;
+}
 
-/*//宮嶋追記(TOPでのログアウトボタン)*/
-.logoutBtn {
-    color: white;
-    margin-top: 10px;
+.sign-up-form {
+    margin-bottom: 20px;
+}
+
+#ok-btn, #close-btn {
+    width: 150px;
+    height: 50px;
+    margin-top: 50px;
+    margin-left: 20px;
+    font-weight: bold;
+    background-color: #1abc9c;
+    border-radius: 3px;
+    border:none;
+    color: #000;
+}
+
+#ok-btn {
+    margin-left: 50px;
+}
+
+.modal__content {
+    text-align: center;
+    padding-right: 100px;
 }
 
+#sign-up-text {
+    font-size: 30px;
+    margin-bottom: 30px;
+    margin-left: 60px;
+    color: #000;
+}
+
+.attention {
+    color: red;
+    margin-left: 190px;
+    text-align: left;
+}
+
+
+/* ログイン画面終了 */
+
+

src/main/resources/static/js/login.js

+$(function(){
+    $('.js-modal-open').on('click',function(){
+        $('.js-modal').fadeIn();
+        return false;
+    });
+    $('.js-modal-close').on('click',function(){
+        $('.js-modal').fadeOut();
+        return false;
+    });
+});
\ No newline at end of file

src/main/resources/templates/login.html

@@ -6,9 +6,8 @@
         <title>Mart - HTML5 Resoponsive onepage e-commerce template </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}"/>
 
         <!--[if lt IE 9]>
             <script src="//html5shiv.googlecode.com/svn/trunk/html5.js"></script>
@@ -52,26 +51,26 @@
 
         <!-- ログインフォーム -->
         <div class="container">
-            <p id="onlineShoeStore"><span id="onlineShoeStoreSpan">Members-only online shoe store</span></p>
-            <form id="loginForm" method="post" th:action="@{/login}">
-                <div id="emailForm">
-                    <label for="email">Email</label>
-                    <input type="text" class="login" id="email" placeholder="Email" required="true"/>
+            <p id="online-shoe-store"><span id="online-shoe-store-span">Members-only online shoe store</span></p>
+            <form id="login-form" method="post" th:action="@{/login}">
+                <div id="email-form">
+                    <label for="login-email">Email</label>
+                    <input type="email" class="login" id="login-email" placeholder="Email" required="required"/>
                 </div>
-                <div id="passwordForm">
-                    <label for="password">Password</label>
-                    <input type="password" class="login" id="password" placeholder="Password" required="true"/>
+                <div id="password-form">
+                    <label for="login-password">Password</label>
+                    <input type="password" class="login" id="login-password" placeholder="Password" required="required"/>
                 </div>
-                <div id="submitForm">
+                <div id="submit-form">
                     <input type="submit" class="login" id="btn" value="Login"/>
-                <!-- 会員登録ボタン -->
-                <input type="button" class="login" id="signUp" value="Sign Up"/>
+                    <!-- 会員登録ボタン -->
+                    <button class="js-modal-open" id="sign-up">Sign Up</button>
                 </div>
             </form>
         </div>
 
         <!-- footer -->
-        <footer class="footer" id="loginFooter">
+        <footer class="footer" id="login-footer">
             <div class="container">
                 <div class="row">
                     <div class="col-md-12">
@@ -82,12 +81,55 @@
             </div>
         </footer>
 
+        <!-- モーダル中身 -->
+        <div class="modal js-modal">
+            <div class="modal__bg js-modal-close"></div>
+            <div class="modal__content">
+                <div class="sign-up-form">
+                    <p id="sign-up-text">Sign Up</p>
+                    <label for="name" class="sign-up-form-label">Name</label>
+                    <input type="text" id="name" class="sign-up-form-input" placeholder="Name" required="required"/>
+                </div>
+                <div class="sign-up-form">
+                    <label for="postal-code" class="sign-up-form-label">Postal Code</label>
+                    <input type="text" id="postal-code" class="sign-up-form-input" placeholder="Postal Code" required="required"/>
+                    <p class="attention">Please enter 7-digit alphanumeric characters with no hyphens.</p>
+                </div>
+                <div class="sign-up-form">
+                    <label for="address" class="sign-up-form-label">Address</label>
+                    <input type="text" id="address" class="sign-up-form-input" placeholder="Address" required="required"/>
+                    <p class="attention">Please enter numbers in half-width characters.</p>
+                </div>
+                <div class="sign-up-form">
+                    <label for="phone-number" class="sign-up-form-label">Phone Number</label>
+                    <input type="text" id="phone-number" class="sign-up-form-input" placeholder="Phone Number" required="required"/>
+                    <p class="attention">Please enter 11-digit alphanumeric characters with no hyphens.</p>
+                </div>
+                <div class="sign-up-form">
+                    <label for="email" class="sign-up-form-label">Email</label>
+                    <input type="email" id="email" class="sign-up-form-input" placeholder="Email" required="required"/>
+                </div>
+                <div class="sign-up-form">
+                    <label for="password" class="sign-up-form-label">Password</label>
+                    <input type="password" id="password" class="sign-up-form-input" placeholder="Password" required="required"/>
+                </div>
+                <div>
+                    <button class="js-modal-sign-up" id="ok-btn">Ok</button>
+                    <button class="js-modal-close" id="close-btn">Close</button>
+                </div>
+            </div><!--modal__inner-->
+        </div><!--modal-->
+
+        <!-- モーダル用 -->
+        <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.9.1/jquery.min.js"></script>
         <!-- 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="js/login.js" th:src="@{/js/login.js}"></script>
+
     </body>
 </html>