fixed assets bug

GoAdminGroup · Oct 7, 2019 · f2d78dc · f2d78dc
1 parent 991e1e2
commit f2d78dc
Show file tree

Hide file tree

Showing 11 changed files with 469 additions and 37 deletions.
diff --git a/Makefile b/Makefile
@@ -10,7 +10,7 @@ assets:
 	mkdir ./template/adminlte/resource/assets/dist/js
 	mkdir ./template/adminlte/resource/assets/dist/css
 	cp ./template/adminlte/resource/assets/src/js/*.js ./template/adminlte/resource/assets/dist/js/
-	cp ./template/adminlte/resource/assets/src/css/blue.png ./template/adminlte/resource/assets/dist/css/blue.png
+	cp ./template/adminlte/resource/assets/src/css/*.png ./template/adminlte/resource/assets/dist/css/
 	cp -R ./template/adminlte/resource/assets/src/css/fonts ./template/adminlte/resource/assets/dist/css/
 	cp -R ./template/adminlte/resource/assets/src/img ./template/adminlte/resource/assets/dist/
 	cp -R ./template/adminlte/resource/assets/src/fonts ./template/adminlte/resource/assets/dist/

diff --git a/admincli/Makefile b/admincli/Makefile
@@ -1,8 +1,8 @@
 GOCMD=go
 GOBUILD=$(GOCMD) build
 BINARY_NAME=admincli
-LASTVERSION=v0.4.0
-VERSION=v0.4.1
+LASTVERSION=v0.4.1
+VERSION=v0.4.2
 
 all:
 	GO111MODULE=on $(GOBUILD) -o ./build/mac/$(BINARY_NAME)

diff --git a/modules/system/version.go b/modules/system/version.go
@@ -1,3 +1,3 @@
 package system
 
-const Version = "v0.4.1"
+const Version = "v0.4.2"
diff --git a/template/adminlte/resource/assets.go b/template/adminlte/resource/assets.go
diff --git a/template/adminlte/resource/assets/src/css/blue@2x.png b/template/adminlte/resource/assets/src/css/blue@2x.png
diff --git a/template/adminlte/resource/assets/src/fonts/glyphicons-halflings-regular.eot b/template/adminlte/resource/assets/src/fonts/glyphicons-halflings-regular.eot
diff --git a/template/adminlte/resource/assets/src/fonts/glyphicons-halflings-regular.svg b/template/adminlte/resource/assets/src/fonts/glyphicons-halflings-regular.svg
diff --git a/template/adminlte/resource/assets/src/fonts/glyphicons-halflings-regular.ttf b/template/adminlte/resource/assets/src/fonts/glyphicons-halflings-regular.ttf
diff --git a/template/adminlte/resource/assets/src/fonts/glyphicons-halflings-regular.woff b/template/adminlte/resource/assets/src/fonts/glyphicons-halflings-regular.woff
diff --git a/template/adminlte/resource/assets/src/fonts/glyphicons-halflings-regular.woff2 b/template/adminlte/resource/assets/src/fonts/glyphicons-halflings-regular.woff2
diff --git a/template/adminlte/resource/assets_list.go b/template/adminlte/resource/assets_list.go
@@ -3,6 +3,7 @@ package resource
 var AssetsList = []string{
 	"/dist/css/all.min.css",
 	"/dist/css/blue.png",
+	"/dist/css/blue@2x.png",
 	"/dist/css/fonts/6xK3dSBYKcSV-LCoeQqfX1RYOo3qOK7g.ttf",
 	"/dist/css/fonts/6xKydSBYKcSV-LCoeQqfX1RYOo3i54rwlxdr.ttf",
 	"/dist/css/fonts/6xKydSBYKcSV-LCoeQqfX1RYOo3ig4vwlxdr.ttf",
@@ -16,6 +17,11 @@ var AssetsList = []string{
 	"/dist/fonts/fontawesome-webfont.ttf",
 	"/dist/fonts/fontawesome-webfont.woff",
 	"/dist/fonts/fontawesome-webfont.woff2",
+	"/dist/fonts/glyphicons-halflings-regular.eot",
+	"/dist/fonts/glyphicons-halflings-regular.svg",
+	"/dist/fonts/glyphicons-halflings-regular.ttf",
+	"/dist/fonts/glyphicons-halflings-regular.woff",
+	"/dist/fonts/glyphicons-halflings-regular.woff2",
 	"/dist/fonts/ionicons.ttf",
 	"/dist/fonts/ionicons.woff",
 	"/dist/img/avatar04.png",