diff options
| -rw-r--r-- | templates/web/fixmystreet/report/_item.html | 20 | ||||
| -rw-r--r-- | web/cobrands/fixmystreet/_base.scss | 35 |
2 files changed, 26 insertions, 29 deletions
diff --git a/templates/web/fixmystreet/report/_item.html b/templates/web/fixmystreet/report/_item.html index 3a2fe2fe7..6014074e0 100644 --- a/templates/web/fixmystreet/report/_item.html +++ b/templates/web/fixmystreet/report/_item.html @@ -1,5 +1,8 @@ <li> <a class="text" href="[% c.uri_for('/report', problem.id ) %]"> + [% IF problem.photo %] + <img class="img" height="60" width="90" src="/photo/[% problem.id %].fp.jpeg" alt=""> + [% END %] <h4>[% problem.title | html %]</h4> <small>[% IF problem.confirmed_local %] [%- prettify_epoch( problem.confirmed_local.epoch, 1 ) %] @@ -8,21 +11,16 @@ [%- END %] [%- IF dist %], [% dist %]km[% END %] [%- IF include_lastupdate AND problem.confirmed != problem.lastupdate AND problem.whensent != problem.lastupdate %], last updated [% prettify_epoch( problem.lastupdate, 1 ) %] - [%- END %]</small> + [%- END %] [% IF include_lastupdate %] - [% IF problem.councils > 1 %] <small>[% loc('(sent to both)') %]</small> - [% ELSIF problem.councils == 0 %] <small>[% loc('(not sent to council)') %]</small> + [% IF problem.councils > 1 %] [% loc('(sent to both)') %] + [% ELSIF problem.councils == 0 %] [% loc('(not sent to council)') %] [% END %] [% END %] [% IF NOT no_fixed AND problem.is_fixed %] - <small>[% loc('(fixed)') %]</small> + [% loc('(fixed)') %] [% ELSIF NOT no_fixed AND problem.is_closed %] - <small>[% loc('(closed)') %]</small> - [% END %] - </a> - [% IF problem.photo %] -<a class="img" href="[% c.uri_for('/report', problem.id ) %]"> - <img height="60" width="90" src="/photo/[% problem.id %].fp.jpeg" alt=""> + [% loc('(closed)') %] + [% END %]</small> </a> - [% END %] </li> diff --git a/web/cobrands/fixmystreet/_base.scss b/web/cobrands/fixmystreet/_base.scss index 44af7a812..4b11cff40 100644 --- a/web/cobrands/fixmystreet/_base.scss +++ b/web/cobrands/fixmystreet/_base.scss @@ -864,6 +864,7 @@ a:hover.button-left { margin:0; padding:0; margin: 0.25em 0 0 0; + /* see note below about this */ display:table; background: #f6f6f6; color:#222222; @@ -881,25 +882,25 @@ a:hover.button-left { background:#e6e6e6; text-decoration: none; } - .text, - .img { - display:table-cell; - vertical-align:top; - } - .img { - text-align:right; - width: 90px; - float: right; - height:auto; - } .text { + /* this is and the display:table above are required otherwise + on iphone the rows end up being slightly wider than the screen */ + display: table-cell; width: 100%; - padding:0.25em 1em; + vertical-align:top; + padding: 0px 0px 0px 1em; + .img { + width: 90px; + float: right; + height:auto; + } h4 { + padding-top: 0.25em; margin:0; } small { color:#666; + padding-bottom: 0.25em; } } >p { @@ -927,18 +928,16 @@ a:hover.button-left { overflow:hidden; .text { float:left; - width:19em; - } - .img { - width:6.25em; - float:right; + small { + display: block; + } } } } } .ie6 .issue-list-a li a { height:5.5em; - .img img { + .img { height:60px; } } |