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

Merge pull request #19 from Chrisleung/master 

修复layer升级后,因layer.css路径改变引起的浮层样式丢失问题
pull/28/head
Karson 2017-12-07 14:54:30 +08:00 committed by GitHub
parent 0ac468d85c cfdd675c05
commit a03435bf70
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4,7 +4,7 @@
@import url("../css/iconfont.css"); @import url("../css/iconfont.css");
@import url("../libs/font-awesome/css/font-awesome.min.css"); @import url("../libs/font-awesome/css/font-awesome.min.css");
@import url("../libs/toastr/toastr.min.css"); @import url("../libs/toastr/toastr.min.css");
@import url("../libs/layer/build/skin/default/layer.css"); @import url("../libs/layer/dist/theme/default/layer.css");
@import url("../libs/bootstrap-table/dist/bootstrap-table.min.css"); @import url("../libs/bootstrap-table/dist/bootstrap-table.min.css");
@import url("../libs/eonasdan-bootstrap-datetimepicker/build/css/bootstrap-datetimepicker.min.css"); @import url("../libs/eonasdan-bootstrap-datetimepicker/build/css/bootstrap-datetimepicker.min.css");
@import url("../libs/bootstrap-daterangepicker/daterangepicker.css"); @import url("../libs/bootstrap-daterangepicker/daterangepicker.css");
@ -693,7 +693,7 @@ form.form-horizontal .control-label {
} }
.layui-layer-fast .layui-layer-setwin .layui-layer-close2, .layui-layer-fast .layui-layer-setwin .layui-layer-close2,
.layui-layer-fast .layui-layer-setwin .layui-layer-close2:hover { .layui-layer-fast .layui-layer-setwin .layui-layer-close2:hover {
background: url('../libs/layer/build/skin/default/icon.png') no-repeat -149px -31px !important; background: url('../libs/layer/dist/theme/default/icon.png') no-repeat -149px -31px !important;
top: -30px; top: -30px;
right: -30px; right: -30px;
} }

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.css
View File

@ -4,5 +4,5 @@
@import url("../css/iconfont.css"); @import url("../css/iconfont.css");
@import url("../libs/font-awesome/css/font-awesome.min.css"); @import url("../libs/font-awesome/css/font-awesome.min.css");
@import url("../libs/toastr/toastr.min.css"); @import url("../libs/toastr/toastr.min.css");
@import url("../libs/layer/build/skin/default/layer.css"); @import url("../libs/layer/dist/theme/default/layer.css");
/*# sourceMappingURL=frontend.css.map */ /*# sourceMappingURL=frontend.css.map */

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

@ -113,7 +113,7 @@ require.config({
deps: ['../libs/plupload/js/moxie.min'], deps: ['../libs/plupload/js/moxie.min'],
exports: "plupload" exports: "plupload"
}, },
// 'layer': ['css!../libs/layer/build/skin/default/layer.css'], // 'layer': ['css!../libs/layer/dist/theme/default/layer.css'],
// 'validator-core': ['css!../libs/nice-validator/dist/jquery.validator.css'], // 'validator-core': ['css!../libs/nice-validator/dist/jquery.validator.css'],
'validator-lang': ['validator-core'], 'validator-lang': ['validator-core'],
// 'selectpage': ['css!../libs/selectpage/selectpage.css'], // 'selectpage': ['css!../libs/selectpage/selectpage.css'],

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

@ -127,7 +127,7 @@ require.config({
deps: ['../libs/plupload/js/moxie.min'], deps: ['../libs/plupload/js/moxie.min'],
exports: "plupload" exports: "plupload"
}, },
// 'layer': ['css!../libs/layer/build/skin/default/layer.css'], // 'layer': ['css!../libs/layer/dist/theme/default/layer.css'],
// 'validator-core': ['css!../libs/nice-validator/dist/jquery.validator.css'], // 'validator-core': ['css!../libs/nice-validator/dist/jquery.validator.css'],
'validator-lang': ['validator-core'], 'validator-lang': ['validator-core'],
// 'selectpage': ['css!../libs/selectpage/selectpage.css'], // 'selectpage': ['css!../libs/selectpage/selectpage.css'],

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

@ -113,7 +113,7 @@ require.config({
deps: ['../libs/plupload/js/moxie.min'], deps: ['../libs/plupload/js/moxie.min'],
exports: "plupload" exports: "plupload"
}, },
// 'layer': ['css!../libs/layer/build/skin/default/layer.css'], // 'layer': ['css!../libs/layer/dist/theme/default/layer.css'],
// 'validator-core': ['css!../libs/nice-validator/dist/jquery.validator.css'], // 'validator-core': ['css!../libs/nice-validator/dist/jquery.validator.css'],
'validator-lang': ['validator-core'], 'validator-lang': ['validator-core'],
// 'selectpage': ['css!../libs/selectpage/selectpage.css'], // 'selectpage': ['css!../libs/selectpage/selectpage.css'],

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

@ -127,7 +127,7 @@ require.config({
deps: ['../libs/plupload/js/moxie.min'], deps: ['../libs/plupload/js/moxie.min'],
exports: "plupload" exports: "plupload"
}, },
// 'layer': ['css!../libs/layer/build/skin/default/layer.css'], // 'layer': ['css!../libs/layer/dist/theme/default/layer.css'],
// 'validator-core': ['css!../libs/nice-validator/dist/jquery.validator.css'], // 'validator-core': ['css!../libs/nice-validator/dist/jquery.validator.css'],
'validator-lang': ['validator-core'], 'validator-lang': ['validator-core'],
// 'selectpage': ['css!../libs/selectpage/selectpage.css'], // 'selectpage': ['css!../libs/selectpage/selectpage.css'],

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

@ -10,7 +10,7 @@
@import url("../css/iconfont.css"); @import url("../css/iconfont.css");
@import url("../libs/font-awesome/css/font-awesome.min.css"); @import url("../libs/font-awesome/css/font-awesome.min.css");
@import url("../libs/toastr/toastr.min.css"); @import url("../libs/toastr/toastr.min.css");
@import url("../libs/layer/build/skin/default/layer.css"); @import url("../libs/layer/dist/theme/default/layer.css");
@import url("../libs/bootstrap-table/dist/bootstrap-table.min.css"); @import url("../libs/bootstrap-table/dist/bootstrap-table.min.css");
@import url("../libs/eonasdan-bootstrap-datetimepicker/build/css/bootstrap-datetimepicker.min.css"); @import url("../libs/eonasdan-bootstrap-datetimepicker/build/css/bootstrap-datetimepicker.min.css");
@import url("../libs/bootstrap-daterangepicker/daterangepicker.css"); @import url("../libs/bootstrap-daterangepicker/daterangepicker.css");
@ -719,7 +719,7 @@ form.form-horizontal .control-label {
} }
//样式二关闭按钮 //样式二关闭按钮
.layui-layer-close2,.layui-layer-close2:hover{ .layui-layer-close2,.layui-layer-close2:hover{
background:url('../libs/layer/build/skin/default/icon.png') no-repeat -149px -31px !important; background:url('../libs/layer/dist/theme/default/icon.png') no-repeat -149px -31px !important;
top:-30px; top:-30px;
right:-30px; right:-30px;
&:after { &:after {

2
public/assets/less/frontend.less
View File

@ -8,5 +8,5 @@
@import url("../css/iconfont.css"); @import url("../css/iconfont.css");
@import url("../libs/font-awesome/css/font-awesome.min.css"); @import url("../libs/font-awesome/css/font-awesome.min.css");
@import url("../libs/toastr/toastr.min.css"); @import url("../libs/toastr/toastr.min.css");
@import url("../libs/layer/build/skin/default/layer.css"); @import url("../libs/layer/dist/theme/default/layer.css");