launchpad-reviewers team mailing list archive

[Tom Wardill <tom.wardill@xxxxxxxxxxxxx>]

Tom Wardill has proposed merging ~twom/launchpad:sassy-css-compress-output into launchpad:master.

Commit message:
Enable compressed output in combo.css

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~twom/launchpad/+git/launchpad/+merge/385040

Accidentally dropped the output style, re-introduce it to combo.css output, but not the test (base.css) output
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of ~twom/launchpad:sassy-css-compress-output into launchpad:master.

diff --git a/Makefile b/Makefile
index 79025fa..262d9a3 100644
--- a/Makefile
+++ b/Makefile
@@ -185,7 +185,7 @@ css_combine: jsbuild_widget_css
 	# Compile the base.css file separately for tests
 	SASS_BINARY_PATH=$(NODE_SASS_BINARY) $(YARN) run node-sass --include-path $(WD)/$(ICING) --follow --output $(WD)/$(ICING)/ $(WD)/$(ICING)/css/base.scss
 	# Compile the combo.css for the main site
-	SASS_BINARY_PATH=$(NODE_SASS_BINARY) $(YARN) run node-sass --include-path $(WD)/$(ICING) --follow --output $(WD)/$(ICING) $(WD)/$(ICING)/combo.scss
+	SASS_BINARY_PATH=$(NODE_SASS_BINARY) $(YARN) run node-sass --include-path $(WD)/$(ICING) --output-style compressed --follow --output $(WD)/$(ICING) $(WD)/$(ICING)/combo.scss
 
 css_watch: jsbuild_widget_css
 	${SHHH} bin/sprite-util create-image