diff options
| author | Matthew Somerville <matthew@mysociety.org> | 2012-04-16 18:19:24 +0100 |
|---|---|---|
| committer | Matthew Somerville <matthew@mysociety.org> | 2012-04-16 18:19:24 +0100 |
| commit | bc178c10b47e7c01bc7dda9c59f1ba6f93c6de53 (patch) | |
| tree | 492a4368413d4e0f856eaee81548328878219259 | |
| parent | a95bf9181775d7e1ae0f6c58f5f7c50bd89f2d9b (diff) | |
Fix map popups (AR1).
| -rw-r--r-- | templates/web/bromley/header.html | 2 | ||||
| -rw-r--r-- | web/cobrands/bromley/bromley.scss | 3 | ||||
| -rw-r--r-- | web/cobrands/fixmystreet/_base.scss | 4 |
3 files changed, 7 insertions, 2 deletions
diff --git a/templates/web/bromley/header.html b/templates/web/bromley/header.html index 527dd6b1f..50b0f8fa1 100644 --- a/templates/web/bromley/header.html +++ b/templates/web/bromley/header.html @@ -61,7 +61,7 @@ %]>[% loc("All reports") %]</[% c.req.uri.path == '/reports' ? 'span' : 'a' %]></li>[% %]<li><[% IF c.req.uri.path == '/alert' %]span[% ELSE %]a href="/alert[% pc ? '/list?pc=' : '' %][% pc | uri %]"[% END %]>[% loc("Local alerts") %]</[% c.req.uri.path == '/alert' ? 'span' : 'a' %]></li>[% - %]<li><[% IF c.req.uri.path == '/faq' %]span[% ELSE %]a href="/faq"[% END + %]<li class="last"><[% IF c.req.uri.path == '/faq' %]span[% ELSE %]a href="/faq"[% END %]>[% loc("Help") %]</[% c.req.uri.path == '/faq' ? 'span' : 'a' %]></li> </ul> </div> diff --git a/web/cobrands/bromley/bromley.scss b/web/cobrands/bromley/bromley.scss index fe538d59d..94b511080 100644 --- a/web/cobrands/bromley/bromley.scss +++ b/web/cobrands/bromley/bromley.scss @@ -93,9 +93,10 @@ body { color: #333; font-family: Arial, 'Helvetica Neue', Helvetica, sans-serif; .header-nav ul { margin: 0; } .header-nav li { list-style-type: none; } // Width is actually 637, but that causes wrap-around, need to ask for fixes and corner image -.main-menu { background: url('/cobrands/bromley/main-menu1.gif') no-repeat; width: 640px; } +.main-menu { background: url('/cobrands/bromley/main-menu1.gif') no-repeat; width: 638px; } .main-menu ul { margin: 0; } .main-menu li { list-style-type: none; } +.main-menu li.last { padding-right: 0; } //#search input { display: inline; margin: 0; @include border-radius(0em); } //#search input.button { font-weight: normal; text-transform: none; } #bromley-footer { padding-bottom: 60px; } diff --git a/web/cobrands/fixmystreet/_base.scss b/web/cobrands/fixmystreet/_base.scss index b82e46246..cd67e3543 100644 --- a/web/cobrands/fixmystreet/_base.scss +++ b/web/cobrands/fixmystreet/_base.scss @@ -144,6 +144,10 @@ img { height:auto; max-width: 100%; } +// So that map popups display correctly +#popup img { + max-width: none; +} select, input, textarea { font-size: 99%; |