Explorar el Código

调整main路径下样式路径

RuoYi hace 4 años
padre
commit
39bd0225b6
Se han modificado 26 ficheros con 26 adiciones y 2936 borrados
  1. 0 2880
      ruoyi-admin/src/main/resources/static/css/animate.css
  2. 0 0
      ruoyi-admin/src/main/resources/static/css/animate.min.css
  3. 0 6
      ruoyi-admin/src/main/resources/static/css/main/bootstrap.min14ed.css
  4. 0 4
      ruoyi-admin/src/main/resources/static/css/main/font-awesome.min93e3.css
  5. 0 1
      ruoyi-admin/src/main/resources/static/css/main/style.min862f.css
  6. BIN
      ruoyi-admin/src/main/resources/static/css/patterns/header-profile-skin-blue.png
  7. BIN
      ruoyi-admin/src/main/resources/static/css/patterns/header-profile-skin-yellow.png
  8. BIN
      ruoyi-admin/src/main/resources/static/css/patterns/header-profile.png
  9. BIN
      ruoyi-admin/src/main/resources/static/css/patterns/shattered.png
  10. 0 19
      ruoyi-admin/src/main/resources/static/css/style.css
  11. 1 0
      ruoyi-admin/src/main/resources/static/css/style.min.css
  12. 1 1
      ruoyi-admin/src/main/resources/templates/demo/form/localrefresh.html
  13. 2 2
      ruoyi-admin/src/main/resources/templates/demo/form/timeline.html
  14. 2 2
      ruoyi-admin/src/main/resources/templates/error/404.html
  15. 2 2
      ruoyi-admin/src/main/resources/templates/error/500.html
  16. 2 2
      ruoyi-admin/src/main/resources/templates/error/business.html
  17. 2 2
      ruoyi-admin/src/main/resources/templates/error/unauth.html
  18. 2 2
      ruoyi-admin/src/main/resources/templates/include.html
  19. 2 2
      ruoyi-admin/src/main/resources/templates/index-topnav.html
  20. 2 2
      ruoyi-admin/src/main/resources/templates/index.html
  21. 1 1
      ruoyi-admin/src/main/resources/templates/login.html
  22. 2 3
      ruoyi-admin/src/main/resources/templates/main.html
  23. 2 2
      ruoyi-admin/src/main/resources/templates/main_v1.html
  24. 1 1
      ruoyi-admin/src/main/resources/templates/monitor/logininfor/logininfor.html
  25. 1 1
      ruoyi-admin/src/main/resources/templates/register.html
  26. 1 1
      ruoyi-admin/src/main/resources/templates/skin.html

La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 2880
ruoyi-admin/src/main/resources/static/css/animate.css


ruoyi-admin/src/main/resources/static/css/main/animate.min.css → ruoyi-admin/src/main/resources/static/css/animate.min.css


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 6
ruoyi-admin/src/main/resources/static/css/main/bootstrap.min14ed.css


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 4
ruoyi-admin/src/main/resources/static/css/main/font-awesome.min93e3.css


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 1
ruoyi-admin/src/main/resources/static/css/main/style.min862f.css


BIN
ruoyi-admin/src/main/resources/static/css/patterns/header-profile-skin-blue.png


BIN
ruoyi-admin/src/main/resources/static/css/patterns/header-profile-skin-yellow.png


BIN
ruoyi-admin/src/main/resources/static/css/patterns/header-profile.png


BIN
ruoyi-admin/src/main/resources/static/css/patterns/shattered.png


+ 0 - 19
ruoyi-admin/src/main/resources/static/css/style.css

@@ -194,16 +194,6 @@ body.body-small .navbar-top-links li:last-child {
     font-size: 12px;
 }
 
-.nav-header {
-    padding: 34px 25px 20px 25px;
-    background: url("patterns/header-profile.png") no-repeat;
-}
-
-.pace-done .nav-header {
-    -webkit-transition: all 0.5s;
-    transition: all 0.5s;
-}
-
 .nav>li.active {
     border-left: 4px solid #19aa8d;
     background: #293846;
@@ -378,11 +368,6 @@ body.mini-navbar .navbar-default .nav>li>.nav-third-level li a {
     padding: 18px 0;
 }
 
-.pace-done .navbar-static-side, .pace-done .nav-header, .pace-done li.active,  .pace-done #page-wrapper, .pace-done .footer {
-    -webkit-transition: all 0.5s;
-    transition: all 0.5s;
-}
-
 .navbar-fixed-top {
     background: #fff;
     -webkit-transition-duration: 0.5s;
@@ -3037,10 +3022,6 @@ body.full-height-layout #wrapper, body.full-height-layout #page-wrapper {
     min-height: auto;
 }
 
-body.boxed-layout {
-    background: url('patterns/shattered.png');
-}
-
 body.boxed-layout #wrapper {
     background-color: #2f4050;
     max-width: 1200px;

La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 1 - 0
ruoyi-admin/src/main/resources/static/css/style.min.css


+ 1 - 1
ruoyi-admin/src/main/resources/templates/demo/form/localrefresh.html

@@ -4,7 +4,7 @@
 <th:block th:include="include :: header('局部刷新')" />
 </head>
 <body class="gray-bg">
-	<div class="wrapper wrapper-content  animated fadeInRight">
+	<div class="wrapper wrapper-content animated fadeInRight">
 		<div class="row">
 			<div class="col-sm-4">
 				<div class="ibox">

+ 2 - 2
ruoyi-admin/src/main/resources/templates/demo/form/timeline.html

@@ -6,8 +6,8 @@
     <title>时间轴</title>
 	<link href="../static/css/bootstrap.min.css" th:href="@{/css/bootstrap.min.css}" rel="stylesheet"/>
     <link href="../static/css/font-awesome.min.css" th:href="@{/css/font-awesome.min.css}" rel="stylesheet"/>
-    <link href="../static/css/main/animate.min.css" th:href="@{/css/main/animate.min.css}" rel="stylesheet"/>
-    <link th:href="@{/css/style.css}" rel="stylesheet"/>
+    <link href="../static/css/animate.min.css" th:href="@{/css/animate.min.css}" rel="stylesheet"/>
+    <link href="../static/css/style.min.css" th:href="@{/css/style.min.css}" rel="stylesheet"/>
 </head>
 <body class="gray-bg">
     <div class="row animated fadeInRight">

+ 2 - 2
ruoyi-admin/src/main/resources/templates/error/404.html

@@ -5,8 +5,8 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <title>RuoYi - 404</title>
     <link th:href="@{/css/bootstrap.min.css}" rel="stylesheet"/>
-    <link th:href="@{/css/animate.css}" rel="stylesheet"/>
-    <link th:href="@{/css/style.css}" rel="stylesheet"/>
+    <link th:href="@{/css/animate.min.css}" rel="stylesheet"/>
+    <link th:href="@{/css/style.min.css}" rel="stylesheet"/>
 </head>
 <body class="gray-bg">
     <div class="middle-box text-center animated fadeInDown">

+ 2 - 2
ruoyi-admin/src/main/resources/templates/error/500.html

@@ -5,8 +5,8 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <title>RuoYi - 500</title>
 	<link th:href="@{/css/bootstrap.min.css}" rel="stylesheet"/>
-    <link th:href="@{/css/animate.css}" rel="stylesheet"/>
-    <link th:href="@{/css/style.css}" rel="stylesheet"/>
+    <link th:href="@{/css/animate.min.css}" rel="stylesheet"/>
+    <link th:href="@{/css/style.min.css}" rel="stylesheet"/>
 </head>
 <body class="gray-bg">
     <div class="middle-box text-center animated fadeInDown">

+ 2 - 2
ruoyi-admin/src/main/resources/templates/error/business.html

@@ -5,8 +5,8 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <title>RuoYi - 403</title>
 	<link th:href="@{/css/bootstrap.min.css}" rel="stylesheet"/>
-    <link th:href="@{/css/animate.css}" rel="stylesheet"/>
-    <link th:href="@{/css/style.css}" rel="stylesheet"/>
+    <link th:href="@{/css/animate.min.css}" rel="stylesheet"/>
+    <link th:href="@{/css/style.min.css}" rel="stylesheet"/>
 </head>
 <body class="gray-bg">
     <div class="middle-box text-center animated fadeInDown">

+ 2 - 2
ruoyi-admin/src/main/resources/templates/error/unauth.html

@@ -5,8 +5,8 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <title>RuoYi - 403</title>
 	<link th:href="@{/css/bootstrap.min.css}" rel="stylesheet"/>
-    <link th:href="@{/css/animate.css}" rel="stylesheet"/>
-    <link th:href="@{/css/style.css}" rel="stylesheet"/>
+    <link th:href="@{/css/animate.min.css}" rel="stylesheet"/>
+    <link th:href="@{/css/style.min.css}" rel="stylesheet"/>
 </head>
 <body class="gray-bg">
     <div class="middle-box text-center animated fadeInDown">

+ 2 - 2
ruoyi-admin/src/main/resources/templates/include.html

@@ -11,8 +11,8 @@
 	<link th:href="@{/css/font-awesome.min.css}" rel="stylesheet"/>
 	<!-- bootstrap-table 表格插件样式 -->
 	<link th:href="@{/ajax/libs/bootstrap-table/bootstrap-table.min.css?v=20210202}" rel="stylesheet"/>
-	<link th:href="@{/css/animate.css}" rel="stylesheet"/>
-	<link th:href="@{/css/style.css?v=20200903}" rel="stylesheet"/>
+	<link th:href="@{/css/animate.min.css}" rel="stylesheet"/>
+	<link th:href="@{/css/style.min.css?v=20200903}" rel="stylesheet"/>
 	<link th:href="@{/ruoyi/css/ry-ui.css?v=4.6.1}" rel="stylesheet"/>
 </head>
 

+ 2 - 2
ruoyi-admin/src/main/resources/templates/index-topnav.html

@@ -11,8 +11,8 @@
     <link th:href="@{/css/bootstrap.min.css}" rel="stylesheet"/>
     <link th:href="@{/css/jquery.contextMenu.min.css}" rel="stylesheet"/>
     <link th:href="@{/css/font-awesome.min.css}" rel="stylesheet"/>
-    <link th:href="@{/css/animate.css}" rel="stylesheet"/>
-    <link th:href="@{/css/style.css}" rel="stylesheet"/>
+    <link th:href="@{/css/animate.min.css}" rel="stylesheet"/>
+    <link th:href="@{/css/style.min.css}" rel="stylesheet"/>
     <link th:href="@{/css/skins.css?v=20200902}" rel="stylesheet"/>
     <link th:href="@{/ruoyi/css/ry-ui.css?v=4.6.1}" rel="stylesheet"/>
 </head>

+ 2 - 2
ruoyi-admin/src/main/resources/templates/index.html

@@ -11,8 +11,8 @@
     <link th:href="@{/css/bootstrap.min.css}" rel="stylesheet"/>
     <link th:href="@{/css/jquery.contextMenu.min.css}" rel="stylesheet"/>
     <link th:href="@{/css/font-awesome.min.css}" rel="stylesheet"/>
-    <link th:href="@{/css/animate.css}" rel="stylesheet"/>
-    <link th:href="@{/css/style.css}" rel="stylesheet"/>
+    <link th:href="@{/css/animate.min.css}" rel="stylesheet"/>
+    <link th:href="@{/css/style.min.css}" rel="stylesheet"/>
     <link th:href="@{/css/skins.css}" rel="stylesheet"/>
     <link th:href="@{/ruoyi/css/ry-ui.css?v=4.6.1}" rel="stylesheet"/>
 </head>

+ 1 - 1
ruoyi-admin/src/main/resources/templates/login.html

@@ -7,7 +7,7 @@
     <meta name="description" content="若依后台管理框架">
     <link href="../static/css/bootstrap.min.css" th:href="@{/css/bootstrap.min.css}" rel="stylesheet"/>
     <link href="../static/css/font-awesome.min.css" th:href="@{/css/font-awesome.min.css}" rel="stylesheet"/>
-    <link href="../static/css/style.css" th:href="@{/css/style.css}" rel="stylesheet"/>
+    <link href="../static/css/style.min.css" th:href="@{/css/style.min.css}" rel="stylesheet"/>
     <link href="../static/css/login.min.css" th:href="@{/css/login.min.css}" rel="stylesheet"/>
     <link href="../static/ruoyi/css/ry-ui.css" th:href="@{/ruoyi/css/ry-ui.css?v=4.6.1}" rel="stylesheet"/>
     <!-- 360浏览器急速模式 -->

+ 2 - 3
ruoyi-admin/src/main/resources/templates/main.html

@@ -8,12 +8,11 @@
     <link rel="shortcut icon" href="favicon.ico">
     <link href="../static/css/bootstrap.min.css" th:href="@{/css/bootstrap.min.css}" rel="stylesheet"/>
     <link href="../static/css/font-awesome.min.css" th:href="@{/css/font-awesome.min.css}" rel="stylesheet"/>
-    <link href="../static/css/main/animate.min.css" th:href="@{/css/main/animate.min.css}" rel="stylesheet"/>
-    <link href="../static/css/main/style.min862f.css" th:href="@{/css/main/style.min862f.css}" rel="stylesheet"/>
+    <link href="../static/css/style.min.css" th:href="@{/css/style.min.css}" rel="stylesheet"/>
 </head>
 
 <body class="gray-bg">
-    <div class="row  border-bottom white-bg dashboard-header">
+    <div class="row border-bottom white-bg dashboard-header">
         <div class="col-sm-12">
             <blockquote class="text-warning" style="font-size:14px">
                                            领取阿里云通用云产品1888优惠券

+ 2 - 2
ruoyi-admin/src/main/resources/templates/main_v1.html

@@ -7,8 +7,8 @@
     <link rel="shortcut icon" href="favicon.ico">
     <link href="../static/css/bootstrap.min.css" th:href="@{/css/bootstrap.min.css}" rel="stylesheet"/>
     <link href="../static/css/font-awesome.min.css" th:href="@{/css/font-awesome.min.css}" rel="stylesheet"/>
-    <link href="../static/css/main/animate.min.css" th:href="@{/css/main/animate.min.css}" rel="stylesheet"/>
-    <link href="../static/css/main/style.min862f.css" th:href="@{/css/main/style.min862f.css}" rel="stylesheet"/>
+    <link href="../static/css/animate.min.css" th:href="@{/css/animate.min.css}" rel="stylesheet"/>
+    <link href="../static/css/style.min.css" th:href="@{/css/style.min.css}" rel="stylesheet"/>
 </head>
 
 <body class="gray-bg">

+ 1 - 1
ruoyi-admin/src/main/resources/templates/monitor/logininfor/logininfor.html

@@ -44,7 +44,7 @@
 		        <a class="btn btn-danger" onclick="$.operate.clean()" shiro:hasPermission="monitor:logininfor:remove">
 	                <i class="fa fa-trash"></i> 清空
 	            </a>
-				<a class="btn btn-primary single disabled" onclick="unlock()" shiro:hasPermission="monitor:logininfor:unlock">
+	            <a class="btn btn-primary single disabled" onclick="unlock()" shiro:hasPermission="monitor:logininfor:unlock">
 					<i class="fa fa-unlock"></i> 解锁
 				</a>
 	            <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="monitor:logininfor:export">

+ 1 - 1
ruoyi-admin/src/main/resources/templates/register.html

@@ -7,7 +7,7 @@
     <meta name="description" content="若依后台管理框架">
     <link href="../static/css/bootstrap.min.css" th:href="@{/css/bootstrap.min.css}" rel="stylesheet"/>
     <link href="../static/css/font-awesome.min.css" th:href="@{/css/font-awesome.min.css}" rel="stylesheet"/>
-    <link href="../static/css/style.css" th:href="@{/css/style.css}" rel="stylesheet"/>
+    <link href="../static/css/style.min.css" th:href="@{/css/style.min.css}" rel="stylesheet"/>
     <link href="../static/css/login.min.css" th:href="@{/css/login.min.css}" rel="stylesheet"/>
     <link href="../static/ruoyi/css/ry-ui.css" th:href="@{/ruoyi/css/ry-ui.css?v=4.6.1}" rel="stylesheet"/>
     <!-- 360浏览器急速模式 -->

+ 1 - 1
ruoyi-admin/src/main/resources/templates/skin.html

@@ -10,7 +10,7 @@
     <![endif]-->
     <link rel="shortcut icon" href="../static/favicon.ico" th:href="@{favicon.ico}"/>
     <link th:href="@{/css/bootstrap.min.css}" rel="stylesheet"/>
-    <link th:href="@{/css/style.css}" rel="stylesheet"/>
+    <link th:href="@{/css/style.min.css}" rel="stylesheet"/>
     <style type="text/css">
 		.list-unstyled{margin:10px;}
 		.full-opacity-hover{opacity:1;filter:alpha(opacity=1);border:1px solid #fff}