diff options
| author | Struan Donald <struan@exo.org.uk> | 2012-06-08 12:27:06 +0100 |
|---|---|---|
| committer | Struan Donald <struan@exo.org.uk> | 2012-06-08 12:27:06 +0100 |
| commit | 66630c094ba7fbb1d05c85de638ae77a8ad8e043 (patch) | |
| tree | 3331bdcfb76e8b0cbe33d2a38045d87232f7ac9d /bin/make_css | |
| parent | aabfdd765ea0217c12307a1effa3852c00eac6a4 (diff) | |
| parent | aa59f68fcb9b26673662033c4c2d72835420ab4a (diff) | |
Merge branch 'barnet-newstyle'
Conflicts:
.gitignore
perllib/FixMyStreet/Cobrand/FixMyStreet.pm
perllib/FixMyStreet/Cobrand/UKCouncils.pm
templates/web/default/reports/council.html
templates/web/fixmystreet/header.html
templates/web/fixmystreet/report/display.html
web/cobrands/bromley/layout.scss
web/cobrands/fixmystreet/fixmystreet.js
web/js/map-OpenLayers.js
Diffstat (limited to 'bin/make_css')
| -rwxr-xr-x | bin/make_css | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/bin/make_css b/bin/make_css index 27cbec1b5..22ebddba2 100755 --- a/bin/make_css +++ b/bin/make_css @@ -16,9 +16,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 +compass compile --output-style compressed $DIRECTORY/cobrands/barnet # The rest are plain sass -for scss in `find $DIRECTORY -name "*.scss" -exec dirname {} \; | uniq | grep -v "cobrands/\(fixmystreet\|bromley\)"` +for scss in `find $DIRECTORY -name "*.scss" -exec dirname {} \; | uniq | grep -v "cobrands/\(fixmystreet\|bromley\|barnet\)"` do sass --scss --update --style compressed $scss done |