sooouh 6 лет назад
Родитель
Сommit
7e60e26c2d
2 измененных файлов с 96 добавлено и 111 удалено
  1. 87 79
      src/client/styles/scss/_login.scss
  2. 9 32
      src/server/views/login.html

+ 87 - 79
src/client/styles/scss/_login.scss

@@ -131,7 +131,7 @@
   // button style
   // button style
 
 
   // ボタンの設定
   // ボタンの設定
-  .button-3 {
+  .btn-login {
     position: relative;
     position: relative;
     overflow: hidden;
     overflow: hidden;
     color: white;
     color: white;
@@ -141,79 +141,47 @@
     border: none;
     border: none;
 
 
     .btn-label {
     .btn-label {
+      position: relative;
+      z-index: 2;
+      color: white;
+      text-decoration: none;
       background-color: rgba($danger, 0.4);
       background-color: rgba($danger, 0.4);
-    }
-
-  }
-
-  .button-3 .btn-label {
-    position: relative;
-    z-index: 2;
-    color: white;
-    text-decoration: none;
-    transition: all .5s ease;
-  }
-
-  .button-3 .btn-label-text {
-    position: relative;
-    z-index: 2;
-    color: white;
-    text-decoration: none;
-    transition: all .5s ease;
-  }
-
-
-  // 加えたいエフェクト
-  .eff-3 {
-    position: absolute;
-    top: -50px;
-    left: 0px;
-    z-index: 0;
-    width: 100%;
-    height: 100%;
-    background-color: rgba(#7e4153, 0.5);
-    // 変化のスピード
-    transition: all .5s ease;
-  }
-
-
-  // ホバーした時のボタンに与えたい変更(設定)
-  .button-3:hover {
-    z-index: 1;
-    color: white;
-  }
+      transition: all .5s ease;
 
 
-  // ホバーしたときのエフェクトに与えたい変更(設定)
-  .button-3:hover .eff-3 {
-    top: 0;
-  }
-
-  .button-3:hover .btn-label {
-    color: #fff;
-  }
-
-  .button-3:hover .btn-label-text {
-    color: #fff;
-  }
+    }
 
 
-  .btn-login.fcbtn {
-    color: white;
-    background-color: rgba(lighten(black, 20%), 0.4);
-    border: none;
-    transition: all 1s ease 0s;
+    .btn-label-text {
+      position: relative;
+      z-index: 2;
+      color: white;
+      text-decoration: none;
+      transition: all .5s ease;
+    }
 
 
-  }
+    // エフェクト用
+    .eff-login {
+      position: absolute;
+      top: -50px;
+      left: 0px;
+      z-index: 0;
+      width: 100%;
+      height: 100%;
+      background-color: rgba(#7e4153, 0.5);
+      transition: all .5s ease;
+    }
 
 
-  .btn-login.fcbtn:hover .eff-3 {
-    top: 0;
-  }
+    // ホバー時に変更
+    &:hover {
+      z-index: 1;
+      color: white;
 
 
-  .btn-login.fcbtn:hover a {
-    color: #fff;
+      .eff-login {
+        top: 0;
+      }
+    }
   }
   }
 
 
-
-  .btn-login.fcbtn,
+  // .btn-login.fcbtn,
   .btn-register.fcbtn,
   .btn-register.fcbtn,
   .btn-login-oauth.fcbtn,
   .btn-login-oauth.fcbtn,
   .btn-collapse-external-auth {
   .btn-collapse-external-auth {
@@ -239,18 +207,6 @@
     }
     }
   }
   }
 
 
-
-  .btn-login.fcbtn {
-    .btn-label {
-      background-color: rgba($danger, 0.4);
-    }
-
-    &:hover,
-    &:after {
-      background-color: #7e4153;
-    }
-  }
-
   /*
   /*
 
 
   .btn-login-oauth.fcbtn#google {
   .btn-login-oauth.fcbtn#google {
@@ -304,6 +260,7 @@
     }
     }
   }
   }
 
 
+  /*
   .btn-register.fcbtn {
   .btn-register.fcbtn {
     .btn-label {
     .btn-label {
       background-color: rgba($success, 0.4);
       background-color: rgba($success, 0.4);
@@ -314,11 +271,62 @@
       min-width: 45px;
       min-width: 45px;
     }
     }
 
 
-    &:hover,
     &:after {
     &:after {
       background-color: #3f7263;
       background-color: #3f7263;
     }
     }
   }
   }
+  */
+
+  .btn-register {
+    position: relative;
+    overflow: hidden;
+    color: white;
+    text-align: center;
+    cursor: pointer;
+    background-color: rgba(lighten(black, 20%), 0.4);
+    border: none;
+
+    .btn-label {
+      position: relative;
+      z-index: 2;
+      color: white;
+      text-decoration: none;
+      background-color: rgba($success, 0.4);
+      transition: all .5s ease;
+
+    }
+
+    .btn-label-text {
+      position: relative;
+      z-index: 2;
+      color: white;
+      text-decoration: none;
+      transition: all .5s ease;
+    }
+
+    // エフェクト用
+    .eff-register {
+      position: absolute;
+      top: -50px;
+      left: 0px;
+      z-index: 0;
+      width: 100%;
+      height: 100%;
+      background-color: rgba(#3f7263, 0.5);
+      transition: all .5s ease;
+    }
+
+    // ホバー時に変更
+    &:hover {
+      z-index: 1;
+      color: white;
+
+      .eff-register {
+        top: 0;
+      }
+    }
+  }
+
 
 
   hr {
   hr {
     margin: 10px 0;
     margin: 10px 0;

+ 9 - 32
src/server/views/login.html

@@ -133,34 +133,10 @@
             <input type="password" class="form-control" placeholder="Password" name="loginForm[password]">
             <input type="password" class="form-control" placeholder="Password" name="loginForm[password]">
           </div>
           </div>
 
 
-
-          <div class="input-group justify-content-center mt-5">
-            <div class="input-group-prepend">
-
-              <button type="submit" class="fcbtn btn btn-login">
-                <div class="eff-3"></div>
-                <span class="btn-label"><i class="icon-login"></i>{{ t('Sign in') }}</span>
-              </button>
-
-            </div>
-          </div>
-
-          <div class="input-group justify-content-center mt-5">
-              <input type="hidden" name="_csrf" value="{{ csrf() }}">
-
-              <button type="submit" class="btn button-3 fcbtn px-0 py-2">
-                <div class="eff-3"></div>
-                <span class="btn-label p-3"><i class="icon-login"></i></span>
-                <span class="btn-label-text p-3">{{ t('Sign in') }}</span>
-              </button>
-            </div>
-
-
           <div class="input-group justify-content-center mt-5">
           <div class="input-group justify-content-center mt-5">
             <input type="hidden" name="_csrf" value="{{ csrf() }}">
             <input type="hidden" name="_csrf" value="{{ csrf() }}">
-
-            <button type="submit" class="btn button-3 fcbtn px-0 py-2">
-              <div class="eff-3"></div>
+            <button type="submit" class="btn btn-login px-0 py-2">
+              <div class="eff-login"></div>
               <span class="btn-label p-3"><i class="icon-login"></i></span>
               <span class="btn-label p-3"><i class="icon-login"></i></span>
               <span class="btn-label-text p-3">{{ t('Sign in') }}</span>
               <span class="btn-label-text p-3">{{ t('Sign in') }}</span>
             </button>
             </button>
@@ -348,14 +324,15 @@
             <input type="password" class="form-control" placeholder="{{ t('Password') }}" name="registerForm[password]" required>
             <input type="password" class="form-control" placeholder="{{ t('Password') }}" name="registerForm[password]" required>
           </div>
           </div>
 
 
-          <input type="hidden" name="_csrf" value="{{ csrf() }}">
-
-          <div class="input-group mt-5 m-b-20 d-flex justify-content-center">
-            <button type="submit" class="fcbtn btn btn-success btn-1b btn-register">
-              <span class="btn-label"><i class="icon-user-follow"></i></span>
-              <span class="btn-label-text">{{ t('Sign up') }}</span>
+          <div class="input-group justify-content-center mt-5">
+            <input type="hidden" name="_csrf" value="{{ csrf() }}">
+            <button type="submit" class="btn btn-register px-0 py-2">
+              <div class="eff-register"></div>
+              <span class="btn-label p-3"><i class="icon-user-follow"></i></span>
+              <span class="btn-label-text p-3">{{ t('Sign up') }}</span>
             </button>
             </button>
           </div>
           </div>
+
         </form>
         </form>
 
 
         <hr>
         <hr>