diff options
| author | silverwind <me@silverwind.io> | 2017-09-21 05:35:11 +0200 |
|---|---|---|
| committer | Lunny Xiao <xiaolunwen@gmail.com> | 2017-09-21 11:35:11 +0800 |
| commit | 1fbfccb4fc9fc99405174b529206524179177474 (patch) | |
| tree | 5b1ae8aec321c4911f1439e3a7a113d19f88e25b /Makefile | |
| parent | fa1cbc2896e6291f1bd4e4ec58bbfea1dfacaa39 (diff) | |
| download | gitea-1fbfccb4fc9fc99405174b529206524179177474.tar.gz gitea-1fbfccb4fc9fc99405174b529206524179177474.zip | |
Use standard lessc and minify CSS using Node.js (#2337)
* Use standard lessc and minify CSS using Node.js
This changes the previous nonstandard `lessc` to the official one and
enables CSS minification via the clean-css module.
To build CSS, Node.js is required along with a `npm install` to get the
tools installed locally in node_modules so there is no dependency on
binaries in PATH. Benefits include:
- Allows one to have a standard lessc in PATH.
- Can now use command line switches on lessc.
- Minified CSS brings faster page load times and also has the benefit
of discouraging contributors from editing CSS directly.
To build CSS, Node.js is required along with a `npm install` to get the
tools installed locally based on the information in `package.json`.
The 'make stylesheet' task was modified to run without condition. This
makes it easier to work on the make task itself without having to delete
files.
Also fixes: https://github.com/go-gitea/gitea/issues/2198
* install node, npm and modules on drone
* .PHONY
* use 'minify' to minify CSS
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 13 |
1 files changed, 5 insertions, 8 deletions
@@ -15,7 +15,6 @@ else endif BINDATA := modules/{options,public,templates}/bindata.go -STYLESHEETS := $(wildcard public/less/index.less public/less/_*.less) DOCKER_TAG := gitea/gitea:latest GOFILES := $(shell find . -name "*.go" -type f ! -path "./vendor/*" ! -path "*/bindata.go") GOFMT ?= gofmt -s @@ -299,14 +298,12 @@ stylesheets-check: stylesheets fi; .PHONY: stylesheets -stylesheets: public/css/index.css - -.IGNORE: public/css/index.css -public/css/index.css: $(STYLESHEETS) - @which lessc > /dev/null; if [ $$? -ne 0 ]; then \ - $(GO) get -u github.com/kib357/less-go/lessc; \ +stylesheets: + @hash minify > /dev/null 2>&1; if [ $$? -ne 0 ]; then \ + $(GO) get -u github.com/tdewolff/minify/cmd/minify; \ fi - lessc -i $< -o $@ + node_modules/.bin/lessc --no-ie-compat public/less/index.less public/css/index.css + minify -o public/css/index.css public/css/index.css .PHONY: swagger-ui swagger-ui: |