首页调整

2018-02-23 16:45:35 +08:00 · 2018-02-23 16:45:35 +08:00 · c86bf131be
parent e9ac8ab9b8
commit c86bf131be
6 changed files with 72 additions and 80 deletions
--- a/src/main/resources/static/css/animate.css
+++ b/src/main/resources/static/css/animate.css
@ -1,6 +1,6 @@
-/* @charset "UTF-8";
+@charset "UTF-8";

-!
+/*!
 Animate.css - http://daneden.me/animate
 Licensed under the MIT license

@ -11,14 +11,13 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of
 The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.

 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
+*/

 .animated {
    -webkit-animation-duration: 1s;
    animation-duration: 1s;
    -webkit-animation-fill-mode: both;
    animation-fill-mode: both;
-    z-index: 100;
 }

 .animated.infinite {
@ -98,7 +97,7 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
    animation-name: flash;
 }

-originally authored by Nick Pettit - https://github.com/nickpettit/glide
+/* originally authored by Nick Pettit - https://github.com/nickpettit/glide */

@-webkit-keyframes pulse {
    0% {
@ -379,7 +378,7 @@ originally authored by Nick Pettit - https://github.com/nickpettit/glide
    animation-name: tada;
 }

-originally authored by Nick Pettit - https://github.com/nickpettit/glide
+/* originally authored by Nick Pettit - https://github.com/nickpettit/glide */

@-webkit-keyframes wobble {
    0% {
@ -1177,9 +1176,9 @@ originally authored by Nick Pettit - https://github.com/nickpettit/glide
@keyframes fadeInRight {
    0% {
        opacity: 0;
-        -webkit-transform: translateX(40px);
-        -ms-transform: translateX(40px);
-        transform: translateX(40px);
+        -webkit-transform: translateX(20px);
+        -ms-transform: translateX(20px);
+        transform: translateX(20px);
    }

    100% {
@ -2636,6 +2635,39 @@ originally authored by Nick Pettit - https://github.com/nickpettit/glide
    animation-name: slideOutUp;
 }

+@-webkit-keyframes slideInUp {
+    0% {
+        -webkit-transform: translateY(2000px);
+        transform: translateY(2000px);
+    }
+
+    100% {
+        opacity: 0;
+        -webkit-transform: translateY(0);
+        transform: translateY(0);
+    }
+}
+
+@keyframes slideInUp {
+    0% {
+        -webkit-transform: translateY(2000px);
+        -ms-transform: translateY(2000px);
+        transform: translateY(2000px);
+    }
+
+    100% {
+        opacity: 0;
+        -webkit-transform: translateY(0);
+        -ms-transform: translateY(0);
+        transform: translateY(0);
+    }
+}
+
+.slideInUp {
+    -webkit-animation-name: slideInUp;
+    animation-name: slideInUp;
+}
+
@-webkit-keyframes slideOutDown {
    0% {
        -webkit-transform: translateY(0);
@ -2773,7 +2805,7 @@ originally authored by Nick Pettit - https://github.com/nickpettit/glide
    animation-name: hinge;
 }

-originally authored by Nick Pettit - https://github.com/nickpettit/glide
+/* originally authored by Nick Pettit - https://github.com/nickpettit/glide */

@-webkit-keyframes rollIn {
    0% {
@ -2810,7 +2842,7 @@ originally authored by Nick Pettit - https://github.com/nickpettit/glide
    animation-name: rollIn;
 }

-originally authored by Nick Pettit - https://github.com/nickpettit/glide
+/* originally authored by Nick Pettit - https://github.com/nickpettit/glide */

@-webkit-keyframes rollOut {
    0% {
@ -2845,5 +2877,4 @@ originally authored by Nick Pettit - https://github.com/nickpettit/glide
 .rollOut {
    -webkit-animation-name: rollOut;
    animation-name: rollOut;
-}
- */
+}
--- a/src/main/resources/static/img/pay.png
+++ b/src/main/resources/static/img/pay.png
--- a/src/main/resources/templates/error/404.html
+++ b/src/main/resources/templates/error/404.html
@ -1,38 +1,23 @@
 <!DOCTYPE html>
 <html>
-
 <head>
-
    <meta charset="utf-8">
    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-
    <title>RuoYi - 404</title>
-
-    <link href="css/bootstrap.min.css" rel="stylesheet">
-    <link href="font-awesome/css/font-awesome.css" rel="stylesheet">
-
-    <link href="css/animate.css" rel="stylesheet">
-    <link href="css/style.css" rel="stylesheet">
-
+    <link href="/css/bootstrap.min.css" rel="stylesheet">
+    <link href="/css/animate.css" rel="stylesheet">
+    <link href="/css/style.css" rel="stylesheet">
 </head>
-
 <body class="gray-bg">
-
-
    <div class="middle-box text-center animated fadeInDown">
        <h1>404</h1>
        <h3 class="font-bold">找不到网页！</h3>
-
        <div class="error-desc">
                                对不起，您正在寻找的页面已经找到。尝试检查URL的错误，然后按浏览器上的刷新按钮或尝试在我们的应用程序中找到其他内容。
            <a href="/" class="btn btn-primary m-t">主页</a>
        </div>
    </div>
-
-    <!-- Mainly scripts -->
-    <script src="js/jquery-3.1.1.min.js"></script>
-    <script src="js/bootstrap.min.js"></script>
-
+    <script src="/js/jquery.min.js?v=2.1.4"></script>
+    <script src="/js/bootstrap.min.js?v=3.3.6"></script>
 </body>
-
 </html>
--- a/src/main/resources/templates/error/500.html
+++ b/src/main/resources/templates/error/500.html
@ -1,24 +1,14 @@
 <!DOCTYPE html>
 <html>
-
 <head>
-
    <meta charset="utf-8">
    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-
    <title>RuoYi - 500</title>
-
-    <link href="css/bootstrap.min.css" rel="stylesheet">
-    <link href="font-awesome/css/font-awesome.css" rel="stylesheet">
-
-    <link href="css/animate.css" rel="stylesheet">
-    <link href="css/style.css" rel="stylesheet">
-
+	<link href="/css/bootstrap.min.css" rel="stylesheet">
+    <link href="/css/animate.css" rel="stylesheet">
+    <link href="/css/style.css" rel="stylesheet">
 </head>
-
 <body class="gray-bg">
-
-
    <div class="middle-box text-center animated fadeInDown">
        <h1>500</h1>
        <h3 class="font-bold">内部服务器错误！</h3>
@ -28,11 +18,7 @@
            <a href="/" class="btn btn-primary m-t">主页</a>
        </div>
    </div>
-
-    <!-- Mainly scripts -->
-    <script src="js/jquery-3.1.1.min.js"></script>
-    <script src="js/bootstrap.min.js"></script>
-
+    <script src="/js/jquery.min.js?v=2.1.4"></script>
+    <script src="/js/bootstrap.min.js?v=3.3.6"></script>
 </body>
-
 </html>
--- a/src/main/resources/templates/error/unauth.html
+++ b/src/main/resources/templates/error/unauth.html
@ -1,24 +1,14 @@
 <!DOCTYPE html>
 <html>
-
 <head>
-
    <meta charset="utf-8">
    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-
    <title>RuoYi - 403</title>
-
-    <link href="css/bootstrap.min.css" rel="stylesheet">
-    <link href="font-awesome/css/font-awesome.css" rel="stylesheet">
-
-    <link href="css/animate.css" rel="stylesheet">
-    <link href="css/style.css" rel="stylesheet">
-
+	<link href="/css/bootstrap.min.css" rel="stylesheet">
+    <link href="/css/animate.css" rel="stylesheet">
+    <link href="/css/style.css" rel="stylesheet">
 </head>
-
 <body class="gray-bg">
-
-
    <div class="middle-box text-center animated fadeInDown">
        <h1>403</h1>
        <h3 class="font-bold">您没有访问权限！</h3>
@ -28,11 +18,7 @@
            <a href="/" class="btn btn-primary m-t">主页</a>
        </div>
    </div>
-
-    <!-- Mainly scripts -->
-    <script src="js/jquery-3.1.1.min.js"></script>
-    <script src="js/bootstrap.min.js"></script>
-
+    <script src="/js/jquery.min.js?v=2.1.4"></script>
+    <script src="/js/bootstrap.min.js?v=3.3.6"></script>
 </body>
-
 </html>
--- a/src/main/resources/templates/index.html
+++ b/src/main/resources/templates/index.html
@ -28,14 +28,16 @@
        <div class="sidebar-collapse">
            <ul class="nav" id="side-menu">
                <li class="nav-header">
-                    <div class="dropdown profile-element">
-                        <span><img src="img/profile_small.jpg" alt="image" class="img-circle" height="60" width="60"/></span>
+                    <div class="dropdown profile-element"> <span>
+                         <img src="img/profile_small.jpg" alt="image" class="img-circle" height="60" width="60"/></span>
                         <a data-toggle="dropdown" class="dropdown-toggle" href="#">
-                            <span class="clear">
-                            <span class="block m-t-xs"><strong class="font-bold" th:text="${user.userName}">Beaut-XX</strong></span>
-                            <span class="text-muted text-xs block">超级管理员</b></span>
-                            </span>
-                         </a>
+                         <span class="clear"><span class="block m-t-xs"><strong class="font-bold" th:text="${user.userName}">RuoYi</strong></span>
+                         <span class="text-muted text-xs block">超级管理员<b class="caret"></b></span> </span> </a>
+                         <ul class="dropdown-menu animated fadeInRight m-t-xs">
+                             <li><a href="profile.html">个人信息</a></li>
+                             <li class="divider"></li>
+                             <li><a href="/logout">退出</a></li>
+                         </ul>
                    </div>
                </li>
                 <li class="active">
@ -78,8 +80,10 @@
                    </form>
                </div>
                <ul class="nav navbar-top-links navbar-right">
-                    <li class="hidden-xs"><a @click="personal" href="#" ><i class="fa fa-id-card"></i> 个人资料</a></li>
-                    <li class="hidden-xs"><a @click="personal" href="/logout" ><i class="fa fa-close"></i> 注销</a></li>
+	                <li>
+	                    <span class="m-r-sm text-muted welcome-message">欢迎来到若依管理后台.</span>
+	                </li>
+                    <li class="hidden-xs"><a href="/logout" ><i class="fa fa-sign-out"></i> 注销</a></li>
                </ul>
            </nav>
        </div>