public: make lessc compile minimize CSS (#5987)

gogs · Mar 14, 2020 · 328c23c · 328c23c
1 parent 268c692
commit 328c23c
Show file tree

Hide file tree

Showing 9 changed files with 38 additions and 3,297 deletions.
diff --git a/Makefile b/Makefile
@@ -6,7 +6,7 @@ TEMPLATES_FILES := $(shell find templates | sed 's/ /\\ /g')
 PUBLIC_FILES := $(shell find public | sed 's/ /\\ /g')
 LESS_FILES := $(wildcard public/less/*.less)
 ASSETS_GENERATED := internal/assets/conf/conf_gen.go internal/assets/templates/templates_gen.go internal/assets/public/public_gen.go
-GENERATED := $(ASSETS_GENERATED) public/css/gogs.css
+GENERATED := $(ASSETS_GENERATED) public/css/gogs.min.css
 
 TAGS = ""
 BUILD_FLAGS = "-v"
@@ -59,10 +59,10 @@ internal/assets/public/public_gen.go: $(PUBLIC_FILES)
 	go generate internal/assets/public/public.go
 	gofmt -s -w $@
 
-less: public/css/gogs.css
+less: public/css/gogs.min.css
 
-public/css/gogs.css: $(LESS_FILES)
-	@type lessc >/dev/null 2>&1 && lessc --source-map "public/less/gogs.less" $@ || echo "lessc command not found or failed"
+public/css/gogs.min.css: $(LESS_FILES)
+	@type lessc >/dev/null 2>&1 && lessc --clean-css --source-map "public/less/gogs.less" $@ || echo "lessc command not found or failed"
 
 clean:
 	find . -name "*.DS_Store" -type f -delete

diff --git a/docs/local_development.md b/docs/local_development.md
@@ -41,6 +41,7 @@ Gogs has the following dependencies:
     ```bash
     brew install go postgresql git go-bindata npm
     npm install -g less
+    npm install -g less-plugin-clean-css
     ```
 
 1. Configure PostgreSQL to start automatically:

diff --git a/internal/assets/public/public_gen.go b/internal/assets/public/public_gen.go
diff --git a/internal/assets/templates/templates_gen.go b/internal/assets/templates/templates_gen.go