1
diff --git a/Makefile b/Makefile
2
index 79025fa..262d9a3 100644
3
--- a/Makefile
4
+++ b/Makefile
5
@@ -185,7 +185,7 @@ css_combine: jsbuild_widget_css
6
185
	# Compile the base.css file separately for tests
185
	# Compile the base.css file separately for tests
7
186
	SASS_BINARY_PATH=$(NODE_SASS_BINARY) $(YARN) run node-sass --include-path $(WD)/$(ICING) --follow --output $(WD)/$(ICING)/ $(WD)/$(ICING)/css/base.scss
186
	SASS_BINARY_PATH=$(NODE_SASS_BINARY) $(YARN) run node-sass --include-path $(WD)/$(ICING) --follow --output $(WD)/$(ICING)/ $(WD)/$(ICING)/css/base.scss
8
187
	# Compile the combo.css for the main site
187
	# Compile the combo.css for the main site
10
188
	SASS_BINARY_PATH=$(NODE_SASS_BINARY) $(YARN) run node-sass --include-path $(WD)/$(ICING) --follow --output $(WD)/$(ICING) $(WD)/$(ICING)/combo.scss
188
	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
11
189
189
12
190
css_watch: jsbuild_widget_css
190
css_watch: jsbuild_widget_css
13
191
	${SHHH} bin/sprite-util create-image
191
	${SHHH} bin/sprite-util create-image
Status:	Merged
Approved by:	Tom Wardill on 2020-06-03
Approved revision:	5771e576997c8be2a014ea66a95265ef5fadd8a5
Merge reported by:	Otto Co-Pilot
Merged at revision:	not available
Proposed branch:	~twom/launchpad:sassy-css-compress-output
Merge into:	launchpad:master
Diff against target:	13 lines (+1/-1) 1 file modified Makefile (+1/-1)
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Colin Watson (community)		2020-06-03	Approve on 2020-06-03
Review via email: mp+385040@code.launchpad.net
1	diff --git a/Makefile b/Makefile
2	index 79025fa..262d9a3 100644
3	--- a/Makefile
4	+++ b/Makefile
5	@@ -185,7 +185,7 @@ css_combine: jsbuild_widget_css
6	185	# Compile the base.css file separately for tests	185	# Compile the base.css file separately for tests
7	186	SASS_BINARY_PATH=$(NODE_SASS_BINARY) $(YARN) run node-sass --include-path $(WD)/$(ICING) --follow --output $(WD)/$(ICING)/ $(WD)/$(ICING)/css/base.scss	186	SASS_BINARY_PATH=$(NODE_SASS_BINARY) $(YARN) run node-sass --include-path $(WD)/$(ICING) --follow --output $(WD)/$(ICING)/ $(WD)/$(ICING)/css/base.scss
8	187	# Compile the combo.css for the main site	187	# Compile the combo.css for the main site
10	188	SASS_BINARY_PATH=$(NODE_SASS_BINARY) $(YARN) run node-sass --include-path $(WD)/$(ICING) --follow --output $(WD)/$(ICING) $(WD)/$(ICING)/combo.scss	188	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
11	189		189
12	190	css_watch: jsbuild_widget_css	190	css_watch: jsbuild_widget_css
13	191	${SHHH} bin/sprite-util create-image	191	${SHHH} bin/sprite-util create-image