Skip to content

Commit 49a4890

Browse files
author
cg33
committed
fixed assets bug
1 parent 43e796f commit 49a4890

28 files changed

+106
-34
lines changed

‎Makefile‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@ combine:
2626

2727
combine-js:
2828
admincli combine js
29+
admincli combine js --path=./template/adminlte/resource/assets/src/js/combine2/ --out=./template/adminlte/resource/assets/dist/js/all_2.min.js
30+
admincli combine js --path=./template/adminlte/resource/assets/src/js/combine3/ --out=./template/adminlte/resource/assets/dist/js/form.min.js
2931

3032
combine-css:
3133
admincli combine css

‎go.mod‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@ require (
2626
github.com/schollz/progressbar/v2 v2.13.0 // indirect
2727
github.com/sirupsen/logrus v1.4.2
2828
github.com/smartystreets/goconvey v0.0.0-20190330032615-68dc04aab96a // indirect
29+
github.com/tdewolff/minify v2.3.6+incompatible
30+
github.com/tdewolff/parse v2.3.4+incompatible // indirect
2931
github.com/yudai/pp v2.0.1+incompatible // indirect
3032
golang.org/x/crypto v0.0.0-20190911031432-227b76d455e7
3133
golang.org/x/net v0.0.0-20190909003024-a7b16738d86b // indirect

‎template/adminlte/resource/assets.go‎

Lines changed: 70 additions & 24 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎template/adminlte/resource/assets/src/js/combine/8_bootstrap.min.js‎ renamed to ‎template/adminlte/resource/assets/src/js/combine2/8_bootstrap.min.js‎

File renamed without changes.

‎template/adminlte/resource/assets/src/js/combine/9_jquery.dataTables.min.js‎ renamed to ‎template/adminlte/resource/assets/src/js/combine2/9_jquery.dataTables.min.js‎

File renamed without changes.

‎template/adminlte/resource/assets/src/js/combine/a_dataTables.bootstrap.min.js‎ renamed to ‎template/adminlte/resource/assets/src/js/combine2/a_dataTables.bootstrap.min.js‎

File renamed without changes.

‎template/adminlte/resource/assets/src/js/combine/b_jquery.slimscroll.min.js‎ renamed to ‎template/adminlte/resource/assets/src/js/combine2/b_jquery.slimscroll.min.js‎

File renamed without changes.

‎template/adminlte/resource/assets/src/js/combine/c_fastclick.js‎ renamed to ‎template/adminlte/resource/assets/src/js/combine2/c_fastclick.js‎

File renamed without changes.

‎template/adminlte/resource/assets/src/js/combine/d_select2.full.min.js‎ renamed to ‎template/adminlte/resource/assets/src/js/combine2/d_select2.full.min.js‎

File renamed without changes.

‎template/adminlte/resource/assets/src/js/combine/e_wangEditor.min.js‎ renamed to ‎template/adminlte/resource/assets/src/js/combine2/e_wangEditor.min.js‎

File renamed without changes.

0 commit comments

Comments
 (0)