diff --git a/build_web.sh b/build_web.sh index 72ad0eb..21027bc 100755 --- a/build_web.sh +++ b/build_web.sh @@ -9,13 +9,12 @@ mkdir -p html/css cd html_orig sh ./packjs.sh +sh ./packcss.sh php ./build_html.php cd .. cp html_orig/js/app.js html/js/ - -sass html_orig/sass/app.scss html/css/app.css -rm html/css/app.css.map +cp html_orig/css/app.css html/css/ cp html_orig/img/* html/img/ cp html_orig/favicon.ico html/favicon.ico diff --git a/esphttpdconfig.mk b/esphttpdconfig.mk index 1bbac87..2f53c05 100644 --- a/esphttpdconfig.mk +++ b/esphttpdconfig.mk @@ -18,7 +18,7 @@ GZIP_COMPRESSION = yes # This option works only when GZIP_COMPRESSION is set to "yes" # http://yui.github.io/yuicompressor/ #Disabled by default. -COMPRESS_W_YUI = yes +COMPRESS_W_YUI = no YUI-COMPRESSOR = /usr/bin/yui-compressor diff --git a/html_orig/packcss.sh b/html_orig/packcss.sh index 89fb1a1..7a0b4f7 100755 --- a/html_orig/packcss.sh +++ b/html_orig/packcss.sh @@ -2,4 +2,4 @@ echo "Building css..." -sass sass/app.scss css/app.css +sass --style compressed sass/app.scss css/app.css