Merge remote-tracking branch 'remotes/origin/master' into hechu1

# Conflicts: # src/core/process/C_TeacherSearchStudent.java # web/jsFile/upload_action.js
6 years ago · ce3b39c21d
parent c29dea0a04
commit ce3b39c21d
3 changed files with 11 additions and 8 deletions
--- a/web/cssFile/images/login-img2.jpg
+++ b/web/cssFile/images/login-img2.jpg
--- a/web/cssFile/login-style.css
+++ b/web/cssFile/login-style.css
@ -1,7 +1,6 @@
 .img-bar{
-  margin: 55px 0 0 0 ;
  width: 100%;
-  height: 600px;
+  height: 655px;
  background: url("images/login-img2.jpg");
  animation: slowShow 0.8s ease;
 }
@ -73,9 +72,9 @@ body{
  to{right: 150px}
 }
@keyframes clickChange {
-  0%{width:100px}
-  50%{width: 120px}
-  100%{width: 100px}
+  0%{width:100px;opacity: 0}
+  50%{width: 120px;opacity: 0.5}
+  100%{width: 100px;opacity: 1}
 }
 .login-cont{
  box-shadow: 3px 3px 8px rgba(0, 0, 0, 0.44);
--- a/web/op_fail.jsp
+++ b/web/op_fail.jsp
@ -11,9 +11,13 @@
    <title>操作失败</title>
 </head>
 <body>
-<div class="option-fail" style="margin: 100px 580px;">
-    <img src="cssFile/images/error.png">
-    <a href="login.jsp" style="margin: 0px auto">返回登陆</a>
+<div class="option-fail" style="margin: 100px auto;width: 400px;height: 400px;border: 5px solid
+#d64341;border-radius: 10px">
+    <img style="display: block;width: 200px;height: 200px;margin: 40px auto" src="cssFile/images/error.png">
+    <a href="login.jsp">
+        <div style="width: 100px;color: white;background-color: #e65e5f;height: 30px;
+    border-radius: 5px;margin: 50px auto;text-align: center;text-decoration: none">返回登陆</div>
+    </a>
 </div>
 </body>
 </html>