aboutsummaryrefslogtreecommitdiffstats
path: root/bin/make_css
diff options
context:
space:
mode:
authorStruan Donald <struan@exo.org.uk>2012-03-27 10:32:11 +0100
committerStruan Donald <struan@exo.org.uk>2012-03-27 10:32:11 +0100
commita2fd089c48ce36b3e015845256fa688a27ff1572 (patch)
tree7a515a48153c855340ba772f046a89e3e3516cf4 /bin/make_css
parentf682af8e012def2ee12c2e2607cad7b4fc9f2161 (diff)
parenteba1039023271bac6178776f9e7d48b79a1c43e3 (diff)
Merge remote-tracking branch 'origin/master' into bromley
Diffstat (limited to 'bin/make_css')
-rwxr-xr-xbin/make_css3
1 files changed, 2 insertions, 1 deletions
diff --git a/bin/make_css b/bin/make_css
index 70625b2f4..27cbec1b5 100755
--- a/bin/make_css
+++ b/bin/make_css
@@ -15,9 +15,10 @@ DIRECTORY=$(cd `dirname $0`/../web && pwd)
# FixMyStreet uses compass
compass compile --output-style compressed $DIRECTORY/cobrands/fixmystreet
+compass compile --output-style compressed $DIRECTORY/cobrands/bromley
# The rest are plain sass
-for scss in `find $DIRECTORY -name "*.scss" -exec dirname {} \; | uniq | grep -v cobrands/fixmystreet`
+for scss in `find $DIRECTORY -name "*.scss" -exec dirname {} \; | uniq | grep -v "cobrands/\(fixmystreet\|bromley\)"`
do
sass --scss --update --style compressed $scss
done