RuoYi 2 年 前
コミット
11a59e7f77
18 ファイル変更456 行追加65 行削除
  1. 1 1
      ruoyi-admin/src/main/resources/static/ajax/libs/layer/layer.min.js
  2. BIN
      ruoyi-admin/src/main/resources/static/ajax/libs/layer/theme/default/icon-ext.png
  3. BIN
      ruoyi-admin/src/main/resources/static/ajax/libs/layer/theme/default/icon.png
  4. 1 1
      ruoyi-admin/src/main/resources/static/ajax/libs/layer/theme/default/layer.css
  5. BIN
      ruoyi-admin/src/main/resources/static/ajax/libs/layer/theme/default/loading-0.gif
  6. BIN
      ruoyi-admin/src/main/resources/static/ajax/libs/layer/theme/default/loading-1.gif
  7. BIN
      ruoyi-admin/src/main/resources/static/ajax/libs/layer/theme/default/loading-2.gif
  8. 42 11
      ruoyi-admin/src/main/resources/static/ajax/libs/layer/theme/moon/style.css
  9. BIN
      ruoyi-admin/src/main/resources/static/ajax/libs/layui/css/modules/font/iconfont.eot
  10. 0 45
      ruoyi-admin/src/main/resources/static/ajax/libs/layui/css/modules/font/iconfont.svg
  11. BIN
      ruoyi-admin/src/main/resources/static/ajax/libs/layui/css/modules/font/iconfont.ttf
  12. BIN
      ruoyi-admin/src/main/resources/static/ajax/libs/layui/css/modules/font/iconfont.woff
  13. 2 2
      ruoyi-admin/src/main/resources/static/ajax/libs/layui/css/modules/laydate.css
  14. BIN
      ruoyi-admin/src/main/resources/static/fonts/iconfont.eot
  15. 405 0
      ruoyi-admin/src/main/resources/static/fonts/iconfont.svg
  16. BIN
      ruoyi-admin/src/main/resources/static/fonts/iconfont.ttf
  17. BIN
      ruoyi-admin/src/main/resources/static/fonts/iconfont.woff
  18. 5 5
      ruoyi-admin/src/main/resources/templates/demo/modal/layer.html

ファイルの差分が大きいため隠しています
+ 1 - 1
ruoyi-admin/src/main/resources/static/ajax/libs/layer/layer.min.js


BIN
ruoyi-admin/src/main/resources/static/ajax/libs/layer/theme/default/icon-ext.png


BIN
ruoyi-admin/src/main/resources/static/ajax/libs/layer/theme/default/icon.png


+ 1 - 1
ruoyi-admin/src/main/resources/static/ajax/libs/layer/theme/default/layer.css

@@ -127,7 +127,7 @@ html #layuicss-layer{display: none; position: absolute; width: 1989px;}
 .layui-layer-setwin .layui-layer-maxmin:after{z-index: 0; margin: -5px 0 0 -1px;}
 .layui-layer-setwin .layui-layer-close{cursor: pointer;}
 .layui-layer-setwin .layui-layer-close:hover{opacity:0.7;}
-.layui-layer-setwin .layui-layer-close2{position:absolute; right: -28px; top: -28px; color: #fff; background-color: #787878; padding: 3px; border: 3px solid; width: 28px; height: 28px; font-size: 16px; font-weight: bolder; border-radius: 50%; margin-left: 0; *right:-18px; _display:none;}
+.layui-layer-setwin .layui-layer-close2{position:absolute; right: -28px; top: -28px; color: #fff; background-color: #787878; padding: 3px; width: 16px; height: 20px; font-size: 16px; font-weight: bolder; border-radius: 50%; margin-left: 0; *right:-18px; _display:none;}
 .layui-layer-setwin .layui-layer-close2:hover{opacity: unset; background-color: #3888f6;}
 
 /* 按钮栏 */

BIN
ruoyi-admin/src/main/resources/static/ajax/libs/layer/theme/default/loading-0.gif


BIN
ruoyi-admin/src/main/resources/static/ajax/libs/layer/theme/default/loading-1.gif


BIN
ruoyi-admin/src/main/resources/static/ajax/libs/layer/theme/default/loading-2.gif


+ 42 - 11
ruoyi-admin/src/main/resources/static/ajax/libs/layer/theme/moon/style.css

@@ -21,35 +21,33 @@ body .layer-ext-moon .layui-layer-title {
     border: none;
 }
 
-body .layer-ext-moon .layui-layer-content .layui-layer-ico {
+body .layer-ext-moon .layui-layer-content .layui-layer-face {
 	height: 32px;
 	width: 32px;
 	top:18.5px;
 }
-body .layer-ext-moon .layui-layer-ico0 {
+body .layer-ext-moon .layui-icon-tips {
 	background: url(default.png) no-repeat -96px 0;
-	;
 }
-body .layer-ext-moon .layui-layer-ico1 {
+body .layer-ext-moon .layui-icon-success {
 	background: url(default.png) no-repeat -224px 0;
-	;
 }
-body .layer-ext-moon .layui-layer-ico2 {
+body .layer-ext-moon .layui-icon-error {
 	background: url(default.png) no-repeat -192px 0;
 }
-body .layer-ext-moon .layui-layer-ico3 {
+body .layer-ext-moon .layui-icon-question {
 	background: url(default.png) no-repeat -160px 0;
 }
-body .layer-ext-moon .layui-layer-ico4 {
+body .layer-ext-moon .layui-icon-lock {
 	background: url(default.png) no-repeat -320px 0;
 }
-body .layer-ext-moon .layui-layer-ico5 {
+body .layer-ext-moon .layui-icon-face-cry {
 	background: url(default.png) no-repeat -288px 0;
 }
-body .layer-ext-moon .layui-layer-ico6 {
+body .layer-ext-moon .layui-icon-face-smile {
 	background: url(default.png) -256px 0;
 }
-body .layer-ext-moon .layui-layer-ico7 {
+body .layer-ext-moon .layui-layer-download {
 	background: url(default.png) no-repeat -128px 0;
 }
 body .layer-ext-moon .layui-layer-setwin {
@@ -136,3 +134,36 @@ body .layer-ext-moon .layui-layer-btn .layui-layer-btn3 {
 body .layer-ext-moon .layui-layer-title span.layui-layer-tabnow{
 	height:47px;
 }
+
+/** 图标字体 **/
+@font-face {
+  font-family: 'layui-icon';
+  src: url('../../../../../fonts/iconfont.woff?v=282') format('woff');
+}
+
+.layui-icon{
+  font-family:"layui-icon" !important;
+  font-style: normal;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+}
+/* font-class */
+.layui-icon-left:before{content:"\e603"}
+.layui-icon-right:before{content:"\e602"}
+.layui-icon-refresh:before{content:"\e669"}
+.layui-icon-slider:before{content:"\e714"}
+.layui-icon-add-circle:before{content:"\e61f"}
+.layui-icon-reduce-circle:before{content:"\e616"}
+.layui-icon-refresh-1:before{content:"\e666"}
+.layui-icon-loading:before{content:"\e63d"}
+.layui-icon-loading-1:before{content:"\e63e"}
+
+/** 循环旋转动画 **/
+.layui-anim{-webkit-animation-duration: 0.3s; -webkit-animation-fill-mode: both; animation-duration: 0.3s; animation-fill-mode: both;}
+.layui-anim.layui-icon{display: inline-block;}
+.layui-anim-loop{-webkit-animation-iteration-count: infinite; animation-iteration-count: infinite;}
+.layui-trans,
+.layui-trans a{transition: all .2s; -webkit-transition: all .2s;}
+@-webkit-keyframes layui-rotate{from {-webkit-transform: rotate(0deg);} to {-webkit-transform: rotate(360deg);}}
+@keyframes layui-rotate{from {transform: rotate(0deg);} to {transform: rotate(360deg);}}
+.layui-anim-rotate{-webkit-animation-name: layui-rotate; animation-name: layui-rotate; -webkit-animation-duration: 1s; animation-duration: 1s;  -webkit-animation-timing-function: linear; animation-timing-function: linear;}

BIN
ruoyi-admin/src/main/resources/static/ajax/libs/layui/css/modules/font/iconfont.eot


ファイルの差分が大きいため隠しています
+ 0 - 45
ruoyi-admin/src/main/resources/static/ajax/libs/layui/css/modules/font/iconfont.svg


BIN
ruoyi-admin/src/main/resources/static/ajax/libs/layui/css/modules/font/iconfont.ttf


BIN
ruoyi-admin/src/main/resources/static/ajax/libs/layui/css/modules/font/iconfont.woff


ファイルの差分が大きいため隠しています
+ 2 - 2
ruoyi-admin/src/main/resources/static/ajax/libs/layui/css/modules/laydate.css


BIN
ruoyi-admin/src/main/resources/static/fonts/iconfont.eot


ファイルの差分が大きいため隠しています
+ 405 - 0
ruoyi-admin/src/main/resources/static/fonts/iconfont.svg


BIN
ruoyi-admin/src/main/resources/static/fonts/iconfont.ttf


BIN
ruoyi-admin/src/main/resources/static/fonts/iconfont.woff


+ 5 - 5
ruoyi-admin/src/main/resources/templates/demo/modal/layer.html

@@ -137,7 +137,7 @@
 	    </div>
 	</div>
     <th:block th:include="include :: footer" />
-    <script type="text/javascript">
+    <script th:inline="javascript">
         var prefix = ctx + "demo/modal";
         
 	    $("#button-confirm").click(function(){
@@ -266,14 +266,14 @@
             		    {
             		        "alt": "默认头像",
             		        "pid": 1, //图片id
-            		        "src": "/img/profile.jpg", //原图地址
-            		        "thumb": "/img/profile.jpg" //缩略图地址
+            		        "src": ctx + "img/profile.jpg", //原图地址
+            		        "thumb": ctx + "img/profile.jpg" //缩略图地址
             		    },
             		    {
                             "alt": "打赏",
                             "pid": 2, //图片id
-                            "src": "/img/pay.png", //原图地址
-                            "thumb": "/img/pay.png" //缩略图地址
+                            "src": ctx + "img/pay.png", //原图地址
+                            "thumb": ctx + "img/pay.png" //缩略图地址
                         }
             		 ]
             };