diff options
| author | Struan Donald <struan@exo.org.uk> | 2012-04-03 10:37:39 +0100 |
|---|---|---|
| committer | Struan Donald <struan@exo.org.uk> | 2012-04-03 10:37:39 +0100 |
| commit | 592924059a07a5a30e8a09dfc4ca8dea56c5c77a (patch) | |
| tree | c99e86d3e3f780427bbf7a9ec0ae5187b697dfa5 /bin/make_css | |
| parent | 65066d275557e16448aa99ecdfa4df62d4d79649 (diff) | |
| parent | d92bbef188eff6c14adf0f0c7b032846b1be85a6 (diff) | |
Merge remote-tracking branch 'origin/master' into send-report-rewrite
Conflicts:
bin/send-reports
perllib/FixMyStreet/Cobrand/Default.pm
perllib/FixMyStreet/Cobrand/FixMyStreet.pm
Diffstat (limited to 'bin/make_css')
| -rwxr-xr-x | bin/make_css | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/bin/make_css b/bin/make_css index 96c768acc..27cbec1b5 100755 --- a/bin/make_css +++ b/bin/make_css @@ -4,12 +4,21 @@ # Generate CSS files from SCSS files. # # Requires sass which you can get from http://sass-lang.com/ +# FixMyStreet cobrand requires compass # -# Copyright (c) 2011 UK Citizens Online Democracy. All rights reserved. +# Copyright (c) 2012 UK Citizens Online Democracy. All rights reserved. # Email: matthew@mysociety.org. WWW: http://www.mysociety.org # # $Id: send-reports,v 1.79 2010-01-06 16:50:26 louise Exp $ -DIRECTORY=$(cd `dirname $0` && pwd) +DIRECTORY=$(cd `dirname $0`/../web && pwd) -sass --scss --update --style compressed $DIRECTORY/.. +# 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\|bromley\)"` +do + sass --scss --update --style compressed $scss +done |