diff options
| author | Matthew Somerville <matthew@mysociety.org> | 2012-03-14 17:40:37 +0000 |
|---|---|---|
| committer | Matthew Somerville <matthew@mysociety.org> | 2012-03-14 17:40:37 +0000 |
| commit | a11553fd048ec83697e785625b579d604cad21cb (patch) | |
| tree | 430f82caf0568effcd83838ad9aa6984d0ef580e | |
| parent | 51e0b140acd94e48abc3586517ab2a35dc7257c1 (diff) | |
Fix CSS generation script for deploy, move report photo up.
| -rwxr-xr-x | bin/make_css | 14 | ||||
| -rw-r--r-- | templates/web/fixmystreet/report/_main.html | 7 | ||||
| -rw-r--r-- | web/cobrands/fixmystreet/base.scss | 6 |
3 files changed, 19 insertions, 8 deletions
diff --git a/bin/make_css b/bin/make_css index 96c768acc..70625b2f4 100755 --- a/bin/make_css +++ b/bin/make_css @@ -4,12 +4,20 @@ # 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 + +# The rest are plain sass +for scss in `find $DIRECTORY -name "*.scss" -exec dirname {} \; | uniq | grep -v cobrands/fixmystreet` +do + sass --scss --update --style compressed $scss +done diff --git a/templates/web/fixmystreet/report/_main.html b/templates/web/fixmystreet/report/_main.html index 9fbd82621..762aa10f7 100644 --- a/templates/web/fixmystreet/report/_main.html +++ b/templates/web/fixmystreet/report/_main.html @@ -1,4 +1,4 @@ -<div class="problem-header"> +<div class="problem-header cf"> <h1>[% problem.title | html %]</h1> <p><em> @@ -12,9 +12,8 @@ [% END %] </em></p> + [% INCLUDE 'report/photo.html' object=problem center=1 %] [% add_links( problem.detail ) | html_para %] - - [% INCLUDE 'report/photo.html' object=problem center=1 %] -</div>
\ No newline at end of file +</div> diff --git a/web/cobrands/fixmystreet/base.scss b/web/cobrands/fixmystreet/base.scss index b0e312375..97755d8d5 100644 --- a/web/cobrands/fixmystreet/base.scss +++ b/web/cobrands/fixmystreet/base.scss @@ -987,7 +987,11 @@ a:hover.button-left { .problem-header { margin-bottom:1em; } - +.problem-header .update-img { + float: right; + margin-left: 0.5em; + margin-bottom: 0.5em; +} // map stuff #map_box{ |