Launchpad itself

Merge ~twom/launchpad:sassy-css-compress-output into launchpad:master

  1. Git
  2. lp:~twom/launchpad
  3. sassy-css-compress-output
  4. Merge into master
Proposed by Tom Wardill
Status: Merged
Approved by: Tom Wardill
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)
Reviewer Review Type Date Requested Status
Colin Watson (community) Approve
Review via email: mp+385040@code.launchpad.net

Commit message

Enable compressed output in combo.css

Description of the change

Accidentally dropped the output style, re-introduce it to combo.css output, but not the test (base.css) output

To post a comment you must log in.
Revision history for this message
Colin Watson (cjwatson) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/Makefile b/Makefile
2index 79025fa..262d9a3 100644
3--- a/Makefile
4+++ b/Makefile
5@@ -185,7 +185,7 @@ css_combine: jsbuild_widget_css
6 # Compile the base.css file separately for tests
7 SASS_BINARY_PATH=$(NODE_SASS_BINARY) $(YARN) run node-sass --include-path $(WD)/$(ICING) --follow --output $(WD)/$(ICING)/ $(WD)/$(ICING)/css/base.scss
8 # Compile the combo.css for the main site
9- SASS_BINARY_PATH=$(NODE_SASS_BINARY) $(YARN) run node-sass --include-path $(WD)/$(ICING) --follow --output $(WD)/$(ICING) $(WD)/$(ICING)/combo.scss
10+ 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
12 css_watch: jsbuild_widget_css
13 ${SHHH} bin/sprite-util create-image

Subscribers

People subscribed via source and target branches

to status/vote changes: