浏览代码

修复Layer皮肤在部分方法下不启作用的BUG
修复Layer.msg的显示错位
优化Layer.tab的显示样式

Karson 7 年之前
父节点
当前提交
e9d26ea603

+ 2 - 1
bower.json

@@ -32,6 +32,7 @@
     "fastadmin-cxselect": "~1.4.0",
     "fastadmin-dragsort": "~1.0.0",
     "fastadmin-addtabs": "~1.0.0",
-    "fastadmin-selectpage": "~1.0.0"
+    "fastadmin-selectpage": "~1.0.0",
+    "fastadmin-layer": "~3.1.2"
   }
 }

+ 6 - 6
public/assets/css/backend.css

@@ -863,13 +863,13 @@ table.table-nowrap thead > tr > th {
 }
 .layui-layer-fast-msg {
   min-width: 100px;
-  border-radius: 2px;
-  background-color: rgba(0, 0, 0, 0.6);
-  color: #fff;
 }
-.layui-layer-fast-msg .layui-layer-content {
-  padding: 12px 25px;
-  text-align: center;
+.layui-layer-fast-tab .layui-layer-title .layui-this {
+  color: #333;
+}
+.layui-layer-fast-tab .layui-layer-content .layui-layer-tabmain {
+  margin: 0;
+  padding: 0;
 }
 .n-bootstrap .input-group > .n-right {
   position: absolute;

文件差异内容过多而无法显示
+ 1 - 1
public/assets/css/backend.min.css


文件差异内容过多而无法显示
+ 1 - 1
public/assets/css/frontend.min.css


+ 1 - 1
public/assets/js/require-backend.js

@@ -43,7 +43,7 @@ require.config({
         'plupload': '../libs/plupload/js/plupload.min',
         'toastr': '../libs/toastr/toastr',
         'jstree': '../libs/jstree/dist/jstree.min',
-        'layer': '../libs/layer/dist/layer',
+        'layer': '../libs/fastadmin-layer/dist/layer',
         'cookie': '../libs/jquery.cookie/jquery.cookie',
         'cxselect': '../libs/fastadmin-cxselect/js/jquery.cxselect',
         'template': '../libs/art-template/dist/template-native',

文件差异内容过多而无法显示
+ 2 - 2
public/assets/js/require-backend.min.js


+ 1 - 1
public/assets/js/require-frontend.js

@@ -43,7 +43,7 @@ require.config({
         'plupload': '../libs/plupload/js/plupload.min',
         'toastr': '../libs/toastr/toastr',
         'jstree': '../libs/jstree/dist/jstree.min',
-        'layer': '../libs/layer/dist/layer',
+        'layer': '../libs/fastadmin-layer/dist/layer',
         'cookie': '../libs/jquery.cookie/jquery.cookie',
         'cxselect': '../libs/fastadmin-cxselect/js/jquery.cxselect',
         'template': '../libs/art-template/dist/template-native',

文件差异内容过多而无法显示
+ 2 - 2
public/assets/js/require-frontend.min.js


+ 11 - 5
public/assets/less/backend.less

@@ -962,12 +962,18 @@ table.table-nowrap {
 
 .layui-layer-fast-msg {
   min-width: 100px;
-  border-radius: 2px;
-  background-color: rgba(0, 0, 0, .6);
-  color: #fff;
+}
+
+.layui-layer-fast-tab {
+  .layui-layer-title {
+    .layui-this {
+      color:#333;
+    }
+  }
   .layui-layer-content {
-    padding: 12px 25px;
-    text-align: center;
+    .layui-layer-tabmain {
+      margin:0;padding:0;
+    }
   }
 }