hitsword
/
fastadmin
mirror of https://gitee.com/karson/fastadmin.git
1
0
Fork 0
Code Issues Releases Wiki Activity

修复Layer皮肤在部分方法下不启作用的BUG 

修复Layer.msg的显示错位
优化Layer.tab的显示样式
pull/MERGE
Karson 2018-07-01 10:53:54 +08:00
parent b65452c7c3
commit e9d26ea603
9 changed files with 27 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
bower.json
View File

@ -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"
}
}

12
public/assets/css/backend.css
View File

@ -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;

2
public/assets/css/backend.min.css vendored
View File

File diff suppressed because one or more lines are too long

2
public/assets/css/frontend.min.css vendored
View File

File diff suppressed because one or more lines are too long

2
public/assets/js/require-backend.js
View File

@ -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',

4
public/assets/js/require-backend.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
public/assets/js/require-frontend.js
View File

@ -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',

4
public/assets/js/require-frontend.min.js vendored
View File

File diff suppressed because one or more lines are too long

16
public/assets/less/backend.less
View File

@ -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;
}
}
}