diff options
| author | silverwind <me@silverwind.io> | 2020-04-30 08:26:37 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-30 07:26:37 +0100 |
| commit | 310699bca71f15cc7b46363800574ba6e74d8c5c (patch) | |
| tree | 0eeb028ed12cafadd7043deb5db7dcb97e84b333 /Makefile | |
| parent | bfda0f38646f66dbae2767eed3097489c456ebf5 (diff) | |
| download | gitea-310699bca71f15cc7b46363800574ba6e74d8c5c.tar.gz gitea-310699bca71f15cc7b46363800574ba6e74d8c5c.zip | |
Patch fomantic-ui to workaround build issue (#11244)
* Patch fomantic-ui to workaround build issue
Better workaround than https://github.com/go-gitea/gitea/issues/10653
for https://github.com/fomantic/Fomantic-UI/issues/1356. It does not
seem like we're getting a new Fomantic-UI release anytime soon, so
this patches it after node_modules installation.
Fixes: https://github.com/go-gitea/gitea/issues/11243
Fixes: https://github.com/go-gitea/gitea/issues/10679
* copy instead of patch
* update package-lock.json
* Update Makefile
Co-Authored-By: Sorien <Sorien@users.noreply.github.com>
* Update web_src/fomantic/css.js
Co-Authored-By: zeripath <art27@cantab.net>
Co-authored-by: Sorien <Sorien@users.noreply.github.com>
Co-authored-by: zeripath <art27@cantab.net>
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
Co-authored-by: guillep2k <18600385+guillep2k@users.noreply.github.com>
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 7 |
1 files changed, 4 insertions, 3 deletions
@@ -107,7 +107,7 @@ endif GO_SOURCES_OWN := $(filter-out vendor/% %/bindata.go, $(GO_SOURCES)) -FOMANTIC_CONFIGS := semantic.json web_src/fomantic/theme.config.less web_src/fomantic/_site/globals/site.variables +FOMANTIC_CONFIGS := semantic.json web_src/fomantic/theme.config.less web_src/fomantic/_site/globals/site.variables web_src/fomantic/css.js FOMANTIC_DEST := public/fomantic/semantic.min.js public/fomantic/semantic.min.css FOMANTIC_DEST_DIR := public/fomantic @@ -589,7 +589,8 @@ fomantic: $(FOMANTIC_DEST) $(FOMANTIC_DEST): $(FOMANTIC_CONFIGS) package-lock.json | node_modules rm -rf $(FOMANTIC_DEST_DIR) cp web_src/fomantic/theme.config.less node_modules/fomantic-ui/src/theme.config - cp web_src/fomantic/_site/globals/* node_modules/fomantic-ui/src/_site/globals/ + cp -r web_src/fomantic/_site/* node_modules/fomantic-ui/src/_site/ + cp web_src/fomantic/css.js node_modules/fomantic-ui/tasks/build/css.js npx gulp -f node_modules/fomantic-ui/gulpfile.js build @touch $(FOMANTIC_DEST) @@ -654,4 +655,4 @@ golangci-lint: golangci-lint run --timeout 5m # This endif closes the if at the top of the file -endif
\ No newline at end of file +endif |