diff options
| -rw-r--r-- | templates/web/fixmystreet/report/display.html | 2 | ||||
| -rw-r--r-- | templates/web/fixmystreet/report/new/fill_in_details_form.html | 2 | ||||
| -rwxr-xr-x | templates/web/fixmystreet/reports/index.html | 12 | ||||
| -rw-r--r-- | web/cobrands/fixmystreet/base.scss | 12 | ||||
| -rw-r--r-- | web/cobrands/fixmystreet/fixmystreet.js | 2 |
5 files changed, 20 insertions, 10 deletions
diff --git a/templates/web/fixmystreet/report/display.html b/templates/web/fixmystreet/report/display.html index d9e98af71..b6ba8c5fb 100644 --- a/templates/web/fixmystreet/report/display.html +++ b/templates/web/fixmystreet/report/display.html @@ -74,7 +74,7 @@ [% IF field_errors.update %] <div class='form-error'>[% field_errors.update %]</div> [% END %] - <textarea name="update" id="form_update" placeholder="[% loc('Please write your update here') %]" required>[% update.text | html %]</textarea> + <textarea rows="7" cols="30" name="update" id="form_update" placeholder="[% loc('Please write your update here') %]" required>[% update.text | html %]</textarea> [% IF c.user && c.user.belongs_to_council( problem.council ) %] <label for="form_state">[% loc( 'State' ) %]</label> diff --git a/templates/web/fixmystreet/report/new/fill_in_details_form.html b/templates/web/fixmystreet/report/new/fill_in_details_form.html index 63a78a158..eb169c1d6 100644 --- a/templates/web/fixmystreet/report/new/fill_in_details_form.html +++ b/templates/web/fixmystreet/report/new/fill_in_details_form.html @@ -65,7 +65,7 @@ [% IF field_errors.detail %] <p class='form-error'>[% field_errors.detail %]</p> [% END %] - <textarea name="detail" id="form_detail" placeholder="[% loc('Please fill in details of the problem.') %]" required>[% report.detail | html %]</textarea> + <textarea rows="7" cols="26" name="detail" id="form_detail" placeholder="[% loc('Please fill in details of the problem.') %]" required>[% report.detail | html %]</textarea> [% IF js %] <div id="form_category_row"> diff --git a/templates/web/fixmystreet/reports/index.html b/templates/web/fixmystreet/reports/index.html index eb0c9d412..96367d4bb 100755 --- a/templates/web/fixmystreet/reports/index.html +++ b/templates/web/fixmystreet/reports/index.html @@ -3,7 +3,10 @@ <h1>[% loc('All Reports') %]</h1> <div class="intro"> - <p>[% loc('This is a summary of all reports on this site; select a particular council to see the reports sent there.') %][% loc('Greyed-out lines are councils that no longer exist.') %]</p> + <p> + [% loc('This is a summary of all reports on this site; select a particular council to see the reports sent there.') %] + [% loc('Greyed-out lines are councils that no longer exist.') %] + </p> </div> <table cellpadding="3" cellspacing="1" border="0" class="nicetable"> @@ -19,9 +22,8 @@ [% FOREACH area IN areas_info_sorted %] <tr align="center" [%- IF area.generation_high == 10 %] class="gone" - [%- ELSIF loop.count % 2 %] class="a" - [%- END -%] - > + [%- ELSIF ! (loop.count % 2) %] class="a" + [%- END %]> <td class="title"><a href="[% area.url %]">[% area.name %]</a></td> <td class="data">[% open.${area.id}.new or 0 %]</td> <td class="data">[% open.${area.id}.older or 0 %]</td> @@ -32,4 +34,4 @@ [% END %] </table> -[% INCLUDE 'footer.html' pagefooter => 'yes' %]
\ No newline at end of file +[% INCLUDE 'footer.html' pagefooter => 'yes' %] diff --git a/web/cobrands/fixmystreet/base.scss b/web/cobrands/fixmystreet/base.scss index 731127897..43ab64135 100644 --- a/web/cobrands/fixmystreet/base.scss +++ b/web/cobrands/fixmystreet/base.scss @@ -647,6 +647,7 @@ button, input[type=submit],.btn{ button.green-btn, input.green-btn{ @include button-reset; + background-color: #9FDE23; @include background (linear-gradient(#9FDE23, #7FB900)) ; color:#fff; border-color: #5B9700; @@ -660,6 +661,7 @@ input.green-btn{ button.red-btn, input.red-btn{ @include button-reset; + background-color: #FF0038; @include background (linear-gradient(#FF0038, #BF002A)) ; color:#fff; border-color: #80001C; @@ -921,7 +923,7 @@ a:hover.button-left { #fms_pan_zoom { right: 0.5em !important; top: 2.75em !important; - left: 0.5em !important; + left: auto !important; } // Openlayers map controls (overrides) @@ -1177,6 +1179,13 @@ table.nicetable { } } tr { + &.gone { + color: #666666; + background-color: #cccccc; + } + &.a { + background:#f6f6f6; + } &:nth-child(even) { background:#f6f6f6; } @@ -1187,7 +1196,6 @@ table.nicetable { td { padding:0.25em; a { - color:#333; &:hover { text-decoration:none; } diff --git a/web/cobrands/fixmystreet/fixmystreet.js b/web/cobrands/fixmystreet/fixmystreet.js index 074b69a9e..b79976664 100644 --- a/web/cobrands/fixmystreet/fixmystreet.js +++ b/web/cobrands/fixmystreet/fixmystreet.js @@ -81,7 +81,7 @@ $(function(){ document.createElement('img').src = '/i/pin-green.png'; //add mobile class if small screen - if(!Modernizr.mq('only screen and (min-width:48em)')) { + if (Modernizr.mq('only screen and (max-width:48em)') && !Modernizr.mq('only screen and (width:48em)')) { $('html').addClass('mobile'); if (typeof fixmystreet !== 'undefined' && fixmystreet.page == 'around') { // Immediately go full screen map if on around page |