diff options
19 files changed, 359 insertions, 317 deletions
@@ -38,6 +38,11 @@ add your own issue if not. We've extracted all of the mobile apps from this repository into the [fixmystreet-mobile repository](https://github.com/mysociety/fixmystreet-mobile). +## Acknowledgements + +Thanks to [Browserstack](https://www.browserstack.com/) who let us use their +web-based cross-browser testing tools for this project. + ## Releases * v1.8.2 (3rd May 2016) diff --git a/locale/sv_SE.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/sv_SE.UTF-8/LC_MESSAGES/FixMyStreet.po index b68ef7cdf..4dee6dbcb 100644 --- a/locale/sv_SE.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/sv_SE.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -12,7 +12,7 @@ msgstr "" "Project-Id-Version: fixmystreet\n" "Report-Msgid-Bugs-To: matthew@mysociety.org\n" "POT-Creation-Date: 2016-05-03 10:41+0100\n" -"PO-Revision-Date: 2016-04-29 13:21+0000\n" +"PO-Revision-Date: 2016-05-29 15:42+0000\n" "Last-Translator: Jon Kristensen <info@jonkri.com>\n" "Language-Team: Swedish (Sweden) (http://www.transifex.com/mysociety/fixmystreet/language/sv_SE/)\n" "Language: sv_SE\n" @@ -24,7 +24,7 @@ msgstr "" #: perllib/FixMyStreet/DB/Result/Problem.pm:618 #: perllib/FixMyStreet/Script/Reports.pm:189 msgid " and " -msgstr "eller" +msgstr " och " #: templates/web/base/report/new/councils_text_all.html:2 #: templates/web/base/report/new/councils_text_none.html:12 @@ -33,7 +33,7 @@ msgstr "eller" #: templates/web/base/report/new/councils_text_some.html:22 #: templates/web/base/report/new/councils_text_some.html:5 msgid " or " -msgstr "eller" +msgstr " eller " #: templates/web/base/admin/edit-league.html:12 msgid "%d edits by %s" @@ -294,8 +294,7 @@ msgstr "Alla rapporter som CSV" #: templates/web/base/footer.html:32 #: templates/web/zurich/admin/index-dm.html:12 -#: templates/web/zurich/admin/stats.html:13 -#: templates/web/zurich/footer.html:20 +#: templates/web/zurich/admin/stats.html:13 templates/web/zurich/footer.html:20 #: templates/web/zurich/nav_over_content.html:6 msgid "All reports" msgstr "Alla rapporter" @@ -414,14 +413,13 @@ msgstr "Efter datum" #: templates/web/base/auth/token.html:21 templates/web/base/email_sent.html:18 msgid "Can’t find our email? Check your spam folder – that’s the solution 99% of the time." -msgstr "Kan du inte hitta vårt e-brev? Kolla din skräppostmapp –– det är lösningen 99% av tiden." +msgstr "Kan du inte hitta vårt e-brev? Kolla din skräppostmapp – det är lösningen 99% av tiden." #: templates/web/base/around/_report_banner.html:5 msgid "Can't see the map? <em>Skip this step</em>" msgstr "Kan du inte se kartan? <em>Hoppa över det här steget</em>" -#: templates/web/base/admin/body.html:68 -#: templates/web/base/admin/index.html:54 +#: templates/web/base/admin/body.html:68 templates/web/base/admin/index.html:54 #: templates/web/base/report/new/category.html:7 #: templates/web/base/report/new/category_wrapper.html:3 #: templates/web/zurich/admin/body.html:14 @@ -589,8 +587,7 @@ msgstr "Bekräfta via epost nedan genom att ange ett nytt lösenord. När du bek msgid "Confirmation" msgstr "Bekräftelse" -#: templates/web/base/admin/body.html:164 -#: templates/web/base/admin/body.html:79 +#: templates/web/base/admin/body.html:164 templates/web/base/admin/body.html:79 #: templates/web/base/admin/category_edit.html:37 #: templates/web/base/admin/category_edit.html:92 #: templates/web/zurich/admin/stats.html:40 @@ -715,8 +712,7 @@ msgid "Delete template" msgstr "Ta bort mall" #: templates/web/base/admin/bodies.html:27 -#: templates/web/base/admin/body.html:175 -#: templates/web/base/admin/body.html:81 +#: templates/web/base/admin/body.html:175 templates/web/base/admin/body.html:81 #: templates/web/base/admin/category_edit.html:42 #: templates/web/base/admin/category_edit.html:93 msgid "Deleted" @@ -1387,10 +1383,9 @@ msgid "Loading..." msgstr "Laddar..." #: templates/web/base/alert/choose.html:1 -#: templates/web/base/alert/choose.html:3 -#: templates/web/base/alert/index.html:1 templates/web/base/alert/index.html:3 -#: templates/web/base/alert/list.html:1 templates/web/base/alert/list.html:5 -#: templates/web/base/alert/updates.html:1 +#: templates/web/base/alert/choose.html:3 templates/web/base/alert/index.html:1 +#: templates/web/base/alert/index.html:3 templates/web/base/alert/list.html:1 +#: templates/web/base/alert/list.html:5 templates/web/base/alert/updates.html:1 #: templates/web/base/tokens/confirm_alert.html:1 msgid "Local RSS feeds and email alerts" msgstr "Lokala RSS-flöden och epostbevakningar" @@ -2094,9 +2089,8 @@ msgstr "Ange om problemet har lösts eller ej" #: perllib/FixMyStreet/App/Model/PhotoSet.pm:150 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:152 #: templates/web/base/js/translation_strings.html:53 -#, fuzzy msgid "Please upload an image only" -msgstr "Ladda upp en JPEG-bild" +msgstr "Ladda upp endast en bild" #: perllib/FixMyStreet/App/Controller/Contact.pm:115 msgid "Please write a message" @@ -2143,8 +2137,7 @@ msgstr "Personlig integritet" msgid "Privacy and cookies" msgstr "Integritetsskydd och kakor" -#: templates/web/base/admin/body.html:200 -#: templates/web/base/admin/body.html:85 +#: templates/web/base/admin/body.html:200 templates/web/base/admin/body.html:85 #: templates/web/base/admin/category_edit.html:45 #: templates/web/base/admin/report_edit.html:77 msgid "Private" @@ -2782,8 +2775,7 @@ msgstr "Prenumerera med epost" #: perllib/FixMyStreet/App/Controller/Admin.pm:1272 #: perllib/FixMyStreet/Cobrand/Zurich.pm:383 #: templates/web/base/admin/bodies.html:25 -#: templates/web/base/admin/index.html:1 -#: templates/web/base/status/index.html:1 +#: templates/web/base/admin/index.html:1 templates/web/base/status/index.html:1 #: templates/web/base/status/index.html:3 #: templates/web/zurich/admin/index-dm.html:1 #: templates/web/zurich/admin/index-sdm.html:1 @@ -3139,7 +3131,7 @@ msgstr "Den här rapporten skickades anonymt." #: perllib/FixMyStreet/Script/Reports.pm:85 msgid "This web page also contains a photo of the problem, provided by the user." -msgstr "Den här sidan innehåller också ett foto av problemet" +msgstr "Länken ovan innehåller också ett foto av problemet." #: templates/web/zurich/admin/report_edit-sdm.html:123 #: templates/web/zurich/admin/report_edit-sdm.html:76 @@ -3331,8 +3323,7 @@ msgstr "Användarsökningen matchar mot användares namn och e-postadresser." #: perllib/FixMyStreet/App/Controller/Admin.pm:1277 #: perllib/FixMyStreet/Cobrand/Zurich.pm:399 -#: templates/web/base/admin/flagged.html:29 -#: templates/web/zurich/header.html:69 +#: templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:69 msgid "Users" msgstr "Användare" @@ -3903,51 +3894,3 @@ msgid "We do <strong>not</strong> yet have details for the other council that co msgid_plural "We do <strong>not</strong> yet have details for the other councils that cover this location." msgstr[0] "Vi har ännu <strong>ingen</strong> information om kommunen på den platsen" msgstr[1] "Kommunen på platsen har valt att inte ta emot rapporter från FixaMinGata." - -#~ msgid "%s, reported at %s" -#~ msgstr "%s, rapporterad %s" - -#~ msgid "About us" -#~ msgstr "Om oss" - -#~ msgid "Email me new local problems" -#~ msgstr "Eposta mig nya problem lokalt" - -#~ msgid "Empty flat or maisonette" -#~ msgstr "Tom lägenhet" - -#~ msgid "Empty house or bungalow" -#~ msgstr "Tomt hus" - -#~ msgid "Empty office or other commercial" -#~ msgstr "Tomt kontor eller annan kommersiell lokal" - -#~ msgid "Empty pub or bar" -#~ msgstr "Tom pub eller bar" - -#~ msgid "Empty public building - school, hospital, etc." -#~ msgstr "Tom publik byggnad - skola, sjukhus, etc." - -#~ msgid "Enter a nearby street name and area, postal code or district in Delhi" -#~ msgstr "Ange ett närligande gatunamn och ort, postnummer och distrikt i Delhi" - -#~ msgid "FixMyStreet" -#~ msgstr "FixaMinGata" - -#~ msgid "I am afraid you cannot confirm unconfirmed reports." -#~ msgstr "Tyvärr kan du inte bekräfta obekräftade rapporter" - -#~ msgid "Problems in this area" -#~ msgstr "Problem i detta område" - -#~ msgid "Property type:" -#~ msgstr "Fastighetstyp:" - -#~ msgid "RSS feed of problems in this %s" -#~ msgstr "RSS-flöde för problem i denna %s" - -#~ msgid "Sorry, you can not log in with Facebook. Please try again later." -#~ msgstr "Du kunde inte logga in med Facebook. Försök gärna igen." - -#~ msgid "Whole block of empty flats" -#~ msgstr "Hela block med tomma lägenheter" diff --git a/templates/email/fixamingata/submit.txt b/templates/email/fixamingata/submit.txt index eab487051..4704cbd56 100644 --- a/templates/email/fixamingata/submit.txt +++ b/templates/email/fixamingata/submit.txt @@ -12,17 +12,15 @@ tror medborgaren behöver er uppmärksamhet. [% url %] -[% has_photo %] - ** Uppgiftslämnare Namn: [% name %] Epost: [% email %] -[% phone_line %] +[% phone_line %]** Information om ärendet -** Information om ärendet +ID: [% id %] [% category_line %]Ärende: [% title %] @@ -34,7 +32,9 @@ Epost: [% email %] Longitude: [% longitude %] -[% closest_address %]---------- +** Övrigt + +[% has_photo %][% closest_address %]---------- Svar på det här brevet kommer att skickas till den person som lämnade rapporten. diff --git a/templates/web/fixamingata/about/council.html b/templates/web/fixamingata/about/council.html index 8d968f695..3019f79ff 100755 --- a/templates/web/fixamingata/about/council.html +++ b/templates/web/fixamingata/about/council.html @@ -185,9 +185,7 @@ bäst. verksamhetssystem för att höra dig för. </p> <p> - Vi har också tagit fram en sida med - <a href="https://wiki.ffkp.se/index.php?title=Open311_och_annan_integration_mot_FixaMinGata">teknisk information om integration av FixaMinGata</a> som - kan vara lämplig att titta på för mer information. + Kontakta gärna oss för teknisk information kring integration av FixaMinGata. </p> <h2><a name="kostnader"></a>Kostnader för medverkan</h2> diff --git a/templates/web/fixamingata/about/faq-sv.html b/templates/web/fixamingata/about/faq-sv.html index 05ffdaddc..aea90743b 100755 --- a/templates/web/fixamingata/about/faq-sv.html +++ b/templates/web/fixamingata/about/faq-sv.html @@ -21,6 +21,8 @@ markera problemen på en karta. Tjänsten bygger på en förlaga från Storbrita där tjänsten lanserades i Februari 2007. I Norge lanserades den 2011 och i Sverige 2013. </dd> + <dt>Hur kan jag lämna ett förbättringsförslag kring FixaMinGata?</dt> + <dd>Lämna ditt förslag <a href="javascript:UserVoice.showPopupWidget();">här</a>.</dd> <dt>Hur kommer jag i kontakt med FixaMinGata?</dt> <dd>Använd vårt <a href="/contact">kontaktformulär</a>.</dd> <dt>Vilken typ av problem ska jag rapportera i FixaMinGata?</dt> diff --git a/templates/web/fixamingata/footer.html b/templates/web/fixamingata/footer.html index 376d79ff4..a3cf589b9 100644 --- a/templates/web/fixamingata/footer.html +++ b/templates/web/fixamingata/footer.html @@ -21,7 +21,7 @@ %]>[% loc("Local alerts") %]</[% c.req.uri.path == '/alert' ? 'span' : 'a' %]></li>[% %]<li><[% IF c.req.uri.path == '/faq' %]span[% ELSE %]a href="/faq"[% END %]>[% loc("Help") %]</[% c.req.uri.path == '/faq' ? 'span' : 'a' %]></li> - <li><a href="javascript:UserVoice.showPopupWidget();">Lämna förslag</a></li> + <!-- <li><a href="javascript:UserVoice.showPopupWidget();">Lämna förslag</a></li> --> </ul> </div> </div> @@ -39,21 +39,4 @@ </script> </body> -<!-- Piwik --> -<script type="text/javascript"> - var _paq = _paq || []; - _paq.push(['trackPageView']); - _paq.push(['enableLinkTracking']); - (function() { - var u=(("https:" == document.location.protocol) ? "https" : "http") + "://stats.jonkri.com/"; - _paq.push(['setTrackerUrl', u+'piwik.php']); - _paq.push(['setSiteId', 4]); - var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0]; g.type='text/javascript'; - g.defer=true; g.async=true; g.src=u+'piwik.js'; s.parentNode.insertBefore(g,s); - })(); -</script> -<noscript><p><img src="http://stats.jonkri.com/piwik.php?idsite=4" style="border:0;" alt="" /></p></noscript> -<!-- End Piwik Code --> -<!-- Note, Piwik really should be changed so that we have one for beta and one for www --> - </html> diff --git a/templates/web/fixamingata/front/recent.html b/templates/web/fixamingata/front/recent.html index 255882f41..f3126c6c3 100644 --- a/templates/web/fixamingata/front/recent.html +++ b/templates/web/fixamingata/front/recent.html @@ -13,7 +13,7 @@ }(document, 'script', 'facebook-jssdk'));</script> <link rel="canonical" href="https://plus.google.com/105025269316032228481" /> <div style="height: 50px; position: relative;"><div class="fb-like" data-href="https://www.facebook.com/fixamingata" data-layout="button_count" data-action="like" data-show-faces="true" data-share="true" style="float: left;"></div> <script type="text/javascript" src="https://apis.google.com/js/plusone.js"></script><div style="float: left; padding-left: 20px; padding-top: 2px;"><g:plusone></g:plusone></div></div> - <div style="padding-bottom: 14px;"><a href="https://play.google.com/store/apps/details?id=se.sambruk.fixamingata"><img alt="FixaMin Gata på Google Play" style="height: 45px; width: 129px;" src="/cobrands/fixmystreet/images/google_play_logo.png" /></a></div> + <div style="padding-bottom: 14px;"><a href="https://play.google.com/store/apps/details?id=se.sambruk.fixamingata"><img alt="FixaMin Gata på Google Play" src="/cobrands/fixmystreet/images/google_play_logo.png" style="height: 45px; width: 129px;" /></a><a href="http://appstore.com/fixamingata"><img alt="FixaMin Gata på App Store" src="/cobrands/fixmystreet/images/itunes_store_logo.png" style="height: 40px; padding-left: 19px; padding-top: 1px; vertical-align: top; width: 135px;" /></a></div> [% IF recent_photos.size %] <h2> [% loc('Recently reported problems') %] diff --git a/templates/web/fixamingata/report/new/inline-tips.html b/templates/web/fixamingata/report/new/inline-tips.html index 90bb4f975..4fab9c81c 100644 --- a/templates/web/fixamingata/report/new/inline-tips.html +++ b/templates/web/fixamingata/report/new/inline-tips.html @@ -4,8 +4,10 @@ <li>Var trevlig</li> <li>Ange platser noggrant</li> <li>Skriv hur gammalt problemet är</li> + <li>Fyll i tillräckligt med detaljer för att mottagaren skall kunna hjälpa till</li> </ul> <ul class="dont"> + <li>Vid akut situation används inte FixaMinGata (ex. vattenläckor)</li> <li>Använd inte FixaMinGata för rena synpunkter och förslag</li> <li>Inkludera inte privata kontaktdetaljer i beskrivningen</li> </ul> diff --git a/templates/web/fixamingata/report/new/notes.html b/templates/web/fixamingata/report/new/notes.html index 8f081f637..9ec6b0e29 100644 --- a/templates/web/fixamingata/report/new/notes.html +++ b/templates/web/fixamingata/report/new/notes.html @@ -1,14 +1,8 @@ -<p>[% loc("Please note:") %]</p> - <ul class="plain-list"> - <li>[% loc("We will only use your personal information in accordance with our <a href=\"/privacy\">privacy policy.</a>") %]</li> - <li>[% loc("Please be polite, concise and to the point.") %]</li> - <li>[% loc("Please do not be abusive — abusing your council devalues the service for all users.") %]</li> - <li>[% loc("Writing your message entirely in block capitals makes it hard to read, as does a lack of punctuation.") %]</li> [% IF all_councils.items.first > 0 %] - <li>[% id = all_councils.items.first; + <li style="margin-bottom: 0em;">[% id = all_councils.items.first; tprintf("Kom ihåg att FixaMinGata primärt är avsett för att rapportera fysiska problem som kan åtgärdas. Om ditt problem inte lämpar sig för att rapportera via den här webbsidan kan du kontakta din kommun direkt via <a href='%s'>deras webbsida</a>.", all_body_urls.$id); %]</li> [% ELSE %] - <li>[% loc("Remember that FixMyStreet is primarily for reporting physical problems that can be fixed. If your problem is not appropriate for submission via this site remember that you can contact your council directly using their own website.") %]</li> + <li style="margin-bottom: 0em;">[% loc("Remember that FixMyStreet is primarily for reporting physical problems that can be fixed. If your problem is not appropriate for submission via this site remember that you can contact your council directly using their own website.") %]</li> [% END %] </ul> diff --git a/templates/web/fixamingata/report/new/sidebar.html b/templates/web/fixamingata/report/new/sidebar.html new file mode 100644 index 000000000..972fccf53 --- /dev/null +++ b/templates/web/fixamingata/report/new/sidebar.html @@ -0,0 +1,5 @@ +<div id="report-a-problem-sidebar"> + <div class="sidebar-notes"> + [% INCLUDE 'report/new/notes.html' %] + </div> +</div> diff --git a/templates/web/stevenage/footer.html b/templates/web/stevenage/footer.html index f9bf63fb6..b81a949a1 100644 --- a/templates/web/stevenage/footer.html +++ b/templates/web/stevenage/footer.html @@ -32,6 +32,62 @@ </div><!-- .table-cell --> <div class="nav-wrapper"> + + + <header id="stevenage_cc_header" role="banner"> + <div id="stv-headerWrapper"> + <div id="stv-header"> + <div class="stv-inner"> + + <div id="stv-logo"> + <h1><a href="/"><img src="http://www.stevenage.gov.uk/Images/logo.gif" alt="Stevenage Borough Council"></a></h1> + </div> + + <div class="stv-mapLogo"> + <img src="http://www.stevenage.gov.uk/Images/mapLogo.gif" alt=""> + </div> + + <div id="stv-pageTools" class="stv-floatHolder"> + <div id="stv-searchStatic"> + <label for="search">Search</label> <input type="hidden" name="view" value="Search results"> <input name="search" type="text" value="" placeholder="Search for..." id="stv-search" class="stv-searchInput"> <input type="submit" value="GO"> + </div> + </div> + + <div class="stv-parf stv-floatHolder"> + <a href="http://www.stevenage.gov.uk/pay/"><span class="stv-title">Pay</span> your Council Tax bill and more</a> <a href="http://www.stevenage.gov.uk/apply/"><span class="stv-title">Apply</span> for planning permission and more</a> <a href="http://www.stevenage.gov.uk/report/"><span class="stv-title">Report</span> a missed bin and more</a> <a href="http://www.stevenage.gov.uk/find/" class="stv-find"><span class="stv-title">Find</span> your local councillor and more</a> + </div> + + </div> + </div> + <div id="stv-menu"> + <div id="stv-primaryNavigation"> + <ul id="stv-ctl00_ctl00_PrimaryNavigationLinks" class="stv-floatHolder"> + <li> + <a href="http://www.stevenage.gov.uk/council-services/">Council Services</a> + </li> + <li> + <a href="http://www.stevenage.gov.uk/about-the-council/">About the Council</a> + </li> + <li> + <a href="http://www.stevenage.gov.uk/about-stevenage/">About Stevenage</a> + </li> + <li> + <a href="http://www.stevenage.gov.uk/news-and-events/">News and Events</a> + </li> + <li> + <a href="http://www.stevenage.gov.uk/links/">Popular Links</a> + </li> + <li> + <a href="http://www.stevenage.gov.uk/have-your-say/">Have Your Say</a> + </li> + </ul> + </div> + </div> + </div> + </header> + + + <div class="nav-wrapper-2"> <div id="main-nav" role="navigation"> <ul class="nav-menu nav-menu--main"> diff --git a/templates/web/stevenage/header.html b/templates/web/stevenage/header.html index 11e362612..ffcc9ec86 100644 --- a/templates/web/stevenage/header.html +++ b/templates/web/stevenage/header.html @@ -22,7 +22,7 @@ <script src="[% version('/cobrands/fixmystreet/position_map.js') %]" charset="utf-8"></script> [% INCLUDE 'common_header_tags.html' %] [% extra_js %] - + [% INCLUDE 'tracking_code.html' %] [% PROCESS 'header_extra.html' %] </head> @@ -30,59 +30,9 @@ <div class="wrapper"> <div class="table-cell"> - <header id="stevenage_cc_header" role="banner"> - <div id="stv-headerWrapper"> - <div id="stv-header"> - <div class="stv-inner"> - - <div id="stv-logo"> - <h1><a href="/"><img src="http://www.stevenage.gov.uk/Images/logo.gif" alt="Stevenage Borough Council"></a></h1> - </div> - - <div class="stv-mapLogo"> - <img src="http://www.stevenage.gov.uk/Images/mapLogo.gif" alt=""> - </div> - - <div id="stv-pageTools" class="stv-floatHolder"> - <div id="stv-searchStatic"> - <label for="search">Search</label> <input type="hidden" name="view" value="Search results"> <input name="search" type="text" value="" placeholder="Search for..." id="stv-search" class="stv-searchInput"> <input type="submit" value="GO"> - </div> - </div> - - <div class="stv-parf stv-floatHolder"> - <a href="http://www.stevenage.gov.uk/pay/"><span class="stv-title">Pay</span> your Council Tax bill and more</a> <a href="http://www.stevenage.gov.uk/apply/"><span class="stv-title">Apply</span> for planning permission and more</a> <a href="http://www.stevenage.gov.uk/report/"><span class="stv-title">Report</span> a missed bin and more</a> <a href="http://www.stevenage.gov.uk/find/" class="stv-find"><span class="stv-title">Find</span> your local councillor and more</a> - </div> - - </div> - </div> - <div id="stv-menu"> - <div id="stv-primaryNavigation"> - <ul id="stv-ctl00_ctl00_PrimaryNavigationLinks" class="stv-floatHolder"> - <li> - <a href="http://www.stevenage.gov.uk/council-services/">Council Services</a> - </li> - <li> - <a href="http://www.stevenage.gov.uk/about-the-council/">About the Council</a> - </li> - <li> - <a href="http://www.stevenage.gov.uk/about-stevenage/">About Stevenage</a> - </li> - <li> - <a href="http://www.stevenage.gov.uk/news-and-events/">News and Events</a> - </li> - <li> - <a href="http://www.stevenage.gov.uk/links/">Popular Links</a> - </li> - <li> - <a href="http://www.stevenage.gov.uk/have-your-say/">Have Your Say</a> - </li> - </ul> - </div> - </div> - </div> - </header> <header id="site-header"> <div class="container"> + [% INCLUDE 'header_logo.html' %] <a href="#main-nav" id="nav-link">Main Navigation</a> </div> </header> @@ -90,7 +40,7 @@ [% IF c.user_exists %] <div id="user-meta"> <p> - [% tprintf(loc('Hi %s'), c.user.name || c.user.email) %] + [% tprintf(loc('Hi %s'), c.user.name || c.user.email) %] <a href="/auth/sign_out">[% loc('sign out') %]</a> </p> </div> diff --git a/templates/web/stevenage/header_logo.html b/templates/web/stevenage/header_logo.html new file mode 100644 index 000000000..b30c1d811 --- /dev/null +++ b/templates/web/stevenage/header_logo.html @@ -0,0 +1,2 @@ + <a href="[% c.cobrand.base_url IF admin %]/" id="site-logo"><img src="http://www.stevenage.gov.uk/Images/logo.gif" width="82" height="45"></a> + <a href="[% c.cobrand.base_url IF admin %]/" id="report-cta" title="[%- loc('Report a problem') -%]">[%- loc('Report') -%]</a> diff --git a/web/cobrands/fixamingata/images/itunes_store_logo.png b/web/cobrands/fixamingata/images/itunes_store_logo.png Binary files differnew file mode 100644 index 000000000..b37f4c230 --- /dev/null +++ b/web/cobrands/fixamingata/images/itunes_store_logo.png diff --git a/web/cobrands/stevenage/_colours.scss b/web/cobrands/stevenage/_colours.scss index 6b0d1bcdd..54eda1b2c 100644 --- a/web/cobrands/stevenage/_colours.scss +++ b/web/cobrands/stevenage/_colours.scss @@ -1,5 +1,6 @@ /* COLOURS */ +$menu-image: 'menu-black'; $primary: #066539; $primary_b: $primary; diff --git a/web/cobrands/stevenage/_council_header.scss b/web/cobrands/stevenage/_council_header.scss index a33d07dd4..64ef45feb 100644 --- a/web/cobrands/stevenage/_council_header.scss +++ b/web/cobrands/stevenage/_council_header.scss @@ -3,14 +3,14 @@ /* 1.stv- =FontFace Declarations --------------------------------------------------*/ - @font-face { font-family: 'PTSansNarrowRegular'; src: url('http://www.stevenage.gov.uk/Fonts/PT-Sans-fontfacekit/PTN57F-webfont.eot'); src: url('http://www.stevenage.gov.uk/Fonts/PT-Sans-fontfacekit/PTN57F-webfont.eot?iefix') format('eot'), url('http://www.stevenage.gov.uk/Fonts/PT-Sans-fontfacekit/PTN57F-webfont.woff') format('woff'), url('http://www.stevenage.gov.uk/Fonts/PT-Sans-fontfacekit/PTN57F-webfont.ttf') format('truetype'), url('http://www.stevenage.gov.uk/Fonts/PT-Sans-fontfacekit/PTN57F-webfont.svg#stv-webfontpTBqgUZV') format('svg'); font-weight: normal; font-style: normal; } - @font-face { font-family: 'PTSansCaptionBold'; src: url('http://www.stevenage.gov.uk/Fonts/PT-Sans-fontfacekit/PTC75F-webfont.eot'); src: url('http://www.stevenage.gov.uk/Fonts/PT-Sans-fontfacekit/PTC75F-webfont.eot?iefix') format('eot'), url('http://www.stevenage.gov.uk/Fonts/PT-Sans-fontfacekit/PTC75F-webfont.woff') format('woff'), url('http://www.stevenage.gov.uk/Fonts/PT-Sans-fontfacekit/PTC75F-webfont.ttf') format('truetype'), url('http://www.stevenage.gov.uk/Fonts/PT-Sans-fontfacekit/PTC75F-webfont.svg#stv-webfont8zHvniZB') format('svg'); font-weight: normal; font-style: normal; } - @font-face { font-family: 'PTSansCaptionRegular'; src: url('http://www.stevenage.gov.uk/Fonts/PT-Sans-fontfacekit/PTC55F-webfont.eot'); src: url('http://www.stevenage.gov.uk/Fonts/PT-Sans-fontfacekit/PTC55F-webfont.eot?iefix') format('eot'), url('http://www.stevenage.gov.uk/Fonts/PT-Sans-fontfacekit/PTC55F-webfont.woff') format('woff'), url('http://www.stevenage.gov.uk/Fonts/PT-Sans-fontfacekit/PTC55F-webfont.ttf') format('truetype'), url('http://www.stevenage.gov.uk/Fonts/PT-Sans-fontfacekit/PTC55F-webfont.svg#stv-webfont7qk7wodx') format('svg'); font-weight: normal; font-style: normal; } - @font-face { font-family: 'PTSansBoldItalic'; src: url('http://www.stevenage.gov.uk/Fonts/PT-Sans-fontfacekit/PTS76F-webfont.eot'); src: url('http://www.stevenage.gov.uk/Fonts/PT-Sans-fontfacekit/PTS76F-webfont.eot?iefix') format('eot'), url('http://www.stevenage.gov.uk/Fonts/PT-Sans-fontfacekit/PTS76F-webfont.woff') format('woff'), url('http://www.stevenage.gov.uk/Fonts/PT-Sans-fontfacekit/PTS76F-webfont.ttf') format('truetype'), url('http://www.stevenage.gov.uk/Fonts/PT-Sans-fontfacekit/PTS76F-webfont.svg#stv-webfont2oPncueb') format('svg'); font-weight: normal; font-style: normal; } - @font-face { font-family: 'PTSansBold'; src: url('http://www.stevenage.gov.uk/Fonts/PT-Sans-fontfacekit/PTS75F-webfont.eot'); src: url('http://www.stevenage.gov.uk/Fonts/PT-Sans-fontfacekit/PTS75F-webfont.eot?iefix') format('eot'), url('http://www.stevenage.gov.uk/Fonts/PT-Sans-fontfacekit/PTS75F-webfont.woff') format('woff'), url('http://www.stevenage.gov.uk/Fonts/PT-Sans-fontfacekit/PTS75F-webfont.ttf') format('truetype'), url('http://www.stevenage.gov.uk/Fonts/PT-Sans-fontfacekit/PTS75F-webfont.svg#stv-webfontaW07W6NV') format('svg'); font-weight: normal; font-style: normal; } - @font-face { font-family: 'PTSansItalic'; src: url('http://www.stevenage.gov.uk/Fonts/PT-Sans-fontfacekit/PTS56F-webfont.eot'); src: url('http://www.stevenage.gov.uk/Fonts/PT-Sans-fontfacekit/PTS56F-webfont.eot?iefix') format('eot'), url('http://www.stevenage.gov.uk/Fonts/PT-Sans-fontfacekit/PTS56F-webfont.woff') format('woff'), url('http://www.stevenage.gov.uk/Fonts/PT-Sans-fontfacekit/PTS56F-webfont.ttf') format('truetype'), url('http://www.stevenage.gov.uk/Fonts/PT-Sans-fontfacekit/PTS56F-webfont.svg#stv-webfontV5YcF68V') format('svg'); font-weight: normal; font-style: normal; } - @font-face { font-family: 'PTSansRegular'; src: url('http://www.stevenage.gov.uk/Fonts/PT-Sans-fontfacekit/PTS55F-webfont.eot'); src: url('http://www.stevenage.gov.uk/Fonts/PT-Sans-fontfacekit/PTS55F-webfont.eot?iefix') format('eot'), url('http://www.stevenage.gov.uk/Fonts/PT-Sans-fontfacekit/PTS55F-webfont.woff') format('woff'), url('http://www.stevenage.gov.uk/Fonts/PT-Sans-fontfacekit/PTS55F-webfont.ttf') format('truetype'), url('http://www.stevenage.gov.uk/Fonts/PT-Sans-fontfacekit/PTS55F-webfont.svg#stv-webfontakBUUg6U') format('svg'); font-weight: normal; font-style: normal; } - @font-face { font-family: 'PTSansNarrowBold'; src: url('http://www.stevenage.gov.uk/Fonts/PT-Sans-fontfacekit/PTN77F-webfont.eot'); src: url('http://www.stevenage.gov.uk/Fonts/PT-Sans-fontfacekit/PTN77F-webfont.eot?iefix') format('eot'), url('http://www.stevenage.gov.uk/Fonts/PT-Sans-fontfacekit/PTN77F-webfont.woff') format('woff'), url('http://www.stevenage.gov.uk/Fonts/PT-Sans-fontfacekit/PTN77F-webfont.ttf') format('truetype'), url('http://www.stevenage.gov.uk/Fonts/PT-Sans-fontfacekit/PTN77F-webfont.svg#stv-webfontSTdD4QCq') format('svg'); font-weight: normal; font-style: normal; } + @font-face { font-family: 'PTSansNarrowRegular'; src: url('http://www.stevenage.gov.uk/Fonts/PT-Sans-fontfacekit/PTN57F-webfont.eot'); src: url('http://www.stevenage.gov.uk/Fonts/PT-Sans-fontfacekit/PTN57F-webfont.eot?iefix') format('eot'), url('http://www.stevenage.gov.uk/Fonts/PT-Sans-fontfacekit/PTN57F-webfont.woff') format('woff'), url('http://www.stevenage.gov.uk/Fonts/PT-Sans-fontfacekit/PTN57F-webfont.ttf') format('truetype'), url('http://www.stevenage.gov.uk/Fonts/PT-Sans-fontfacekit/PTN57F-webfont.svg#stv-webfontpTBqgUZV') format('svg'); font-weight: normal; font-style: normal; } + @font-face { font-family: 'PTSansCaptionBold'; src: url('http://www.stevenage.gov.uk/Fonts/PT-Sans-fontfacekit/PTC75F-webfont.eot'); src: url('http://www.stevenage.gov.uk/Fonts/PT-Sans-fontfacekit/PTC75F-webfont.eot?iefix') format('eot'), url('http://www.stevenage.gov.uk/Fonts/PT-Sans-fontfacekit/PTC75F-webfont.woff') format('woff'), url('http://www.stevenage.gov.uk/Fonts/PT-Sans-fontfacekit/PTC75F-webfont.ttf') format('truetype'), url('http://www.stevenage.gov.uk/Fonts/PT-Sans-fontfacekit/PTC75F-webfont.svg#stv-webfont8zHvniZB') format('svg'); font-weight: normal; font-style: normal; } + @font-face { font-family: 'PTSansCaptionRegular'; src: url('http://www.stevenage.gov.uk/Fonts/PT-Sans-fontfacekit/PTC55F-webfont.eot'); src: url('http://www.stevenage.gov.uk/Fonts/PT-Sans-fontfacekit/PTC55F-webfont.eot?iefix') format('eot'), url('http://www.stevenage.gov.uk/Fonts/PT-Sans-fontfacekit/PTC55F-webfont.woff') format('woff'), url('http://www.stevenage.gov.uk/Fonts/PT-Sans-fontfacekit/PTC55F-webfont.ttf') format('truetype'), url('http://www.stevenage.gov.uk/Fonts/PT-Sans-fontfacekit/PTC55F-webfont.svg#stv-webfont7qk7wodx') format('svg'); font-weight: normal; font-style: normal; } + @font-face { font-family: 'PTSansBoldItalic'; src: url('http://www.stevenage.gov.uk/Fonts/PT-Sans-fontfacekit/PTS76F-webfont.eot'); src: url('http://www.stevenage.gov.uk/Fonts/PT-Sans-fontfacekit/PTS76F-webfont.eot?iefix') format('eot'), url('http://www.stevenage.gov.uk/Fonts/PT-Sans-fontfacekit/PTS76F-webfont.woff') format('woff'), url('http://www.stevenage.gov.uk/Fonts/PT-Sans-fontfacekit/PTS76F-webfont.ttf') format('truetype'), url('http://www.stevenage.gov.uk/Fonts/PT-Sans-fontfacekit/PTS76F-webfont.svg#stv-webfont2oPncueb') format('svg'); font-weight: normal; font-style: normal; } + @font-face { font-family: 'PTSansBold'; src: url('http://www.stevenage.gov.uk/Fonts/PT-Sans-fontfacekit/PTS75F-webfont.eot'); src: url('http://www.stevenage.gov.uk/Fonts/PT-Sans-fontfacekit/PTS75F-webfont.eot?iefix') format('eot'), url('http://www.stevenage.gov.uk/Fonts/PT-Sans-fontfacekit/PTS75F-webfont.woff') format('woff'), url('http://www.stevenage.gov.uk/Fonts/PT-Sans-fontfacekit/PTS75F-webfont.ttf') format('truetype'), url('http://www.stevenage.gov.uk/Fonts/PT-Sans-fontfacekit/PTS75F-webfont.svg#stv-webfontaW07W6NV') format('svg'); font-weight: normal; font-style: normal; } + @font-face { font-family: 'PTSansItalic'; src: url('http://www.stevenage.gov.uk/Fonts/PT-Sans-fontfacekit/PTS56F-webfont.eot'); src: url('http://www.stevenage.gov.uk/Fonts/PT-Sans-fontfacekit/PTS56F-webfont.eot?iefix') format('eot'), url('http://www.stevenage.gov.uk/Fonts/PT-Sans-fontfacekit/PTS56F-webfont.woff') format('woff'), url('http://www.stevenage.gov.uk/Fonts/PT-Sans-fontfacekit/PTS56F-webfont.ttf') format('truetype'), url('http://www.stevenage.gov.uk/Fonts/PT-Sans-fontfacekit/PTS56F-webfont.svg#stv-webfontV5YcF68V') format('svg'); font-weight: normal; font-style: normal; } + @font-face { font-family: 'PTSansRegular'; src: url('http://www.stevenage.gov.uk/Fonts/PT-Sans-fontfacekit/PTS55F-webfont.eot'); src: url('http://www.stevenage.gov.uk/Fonts/PT-Sans-fontfacekit/PTS55F-webfont.eot?iefix') format('eot'), url('http://www.stevenage.gov.uk/Fonts/PT-Sans-fontfacekit/PTS55F-webfont.woff') format('woff'), url('http://www.stevenage.gov.uk/Fonts/PT-Sans-fontfacekit/PTS55F-webfont.ttf') format('truetype'), url('http://www.stevenage.gov.uk/Fonts/PT-Sans-fontfacekit/PTS55F-webfont.svg#stv-webfontakBUUg6U') format('svg'); font-weight: normal; font-style: normal; } + @font-face { font-family: 'PTSansNarrowBold'; src: url('http://www.stevenage.gov.uk/Fonts/PT-Sans-fontfacekit/PTN77F-webfont.eot'); src: url('http://www.stevenage.gov.uk/Fonts/PT-Sans-fontfacekit/PTN77F-webfont.eot?iefix') format('eot'), url('http://www.stevenage.gov.uk/Fonts/PT-Sans-fontfacekit/PTN77F-webfont.woff') format('woff'), url('http://www.stevenage.gov.uk/Fonts/PT-Sans-fontfacekit/PTN77F-webfont.ttf') format('truetype'), url('http://www.stevenage.gov.uk/Fonts/PT-Sans-fontfacekit/PTN77F-webfont.svg#stv-webfontSTdD4QCq') format('svg'); font-weight: normal; font-style: normal; } /* 2.stv- =BasicSetup and general styles --------------------------------------------------*/ @@ -23,7 +23,7 @@ max-width: 100%; width: 100%; background-color: #fff; - + #stv-everything { /*font-size: 125%;*/ min-width: 984px; @@ -45,7 +45,7 @@ /* 2.stv-1.stv- =Text Elements --------------------------------------------------*/ h1, h2, h3, h4, h5, h6, legend { - font-family: 'PTSansCaptionRegular', PT Sans Caption, Verdana, Arial, Sans-Serif; + font-family: 'PTSansCaptionRegular', PT Sans Caption, Verdana, Arial, Sans-Serif; color: #656867; font-weight: normal; margin-top: 0; @@ -179,7 +179,7 @@ /* 2.stv-2.stv- =Table --------------------------------------------------*/ - table { + table { border: 1px solid #c0c0be; border-collapse: collapse; margin: 1em 0; @@ -489,7 +489,7 @@ word-spacing: 3px; } - /* 3.stv-3 =Pay, Apply, Report, Find links + /* 3.stv-3 =Pay, Apply, Report, Find links --------------------------------------------------*/ #stv-header .stv-parf { padding-left: 496px; @@ -647,7 +647,7 @@ } #stv-main.stv-home .stv-infoPanel .stv-inner, - #stv-main.stv-landing .stv-infoPanel .stv-inner { + #stv-main.stv-landing .stv-infoPanel .stv-inner { position: relative; } @@ -686,11 +686,11 @@ #stv-main.stv-home .stv-infoPanel .stv-inner .stv-hidden { display: none; - } + } #stv-main.stv-home .stv-infoPanel .stv-inner .stv-selected { display: block; - } + } #stv-main.stv-home .stv-infoPanel .stv-inner .stv-fade, #stv-main.stv-landing .stv-infoPanel .stv-inner .stv-fade { @@ -712,8 +712,8 @@ /* 9.stv- =Layout Fixes - FloatHolder can be used on any div which - has floated item within as oppposed to + FloatHolder can be used on any div which + has floated item within as oppposed to floating the wrapper div aswell.stv- --------------------------------------------------*/ .stv-floatHolder { @@ -729,34 +729,10 @@ visibility:hidden; display:block; } - + } .ie8{ #stv-header #stv-pageTools #stv-searchStatic{ width: 50%; } } - -/* -// Small council Header -body.mappage{ - #stevenage_cc_header{ - #stv-header .stv-parf { - display: none; - } - #stv-header #stv-logo{ - position: static; - float: left; - height: auto; - img{ - height:50px; - width: auto; - } - } - #stv-pageTools.stv-floatHolder{ - position: static; - z-index: auto; - } - } -} -*/
\ No newline at end of file diff --git a/web/cobrands/stevenage/_council_header_responsive.scss b/web/cobrands/stevenage/_council_header_responsive.scss new file mode 100644 index 000000000..e65f097d9 --- /dev/null +++ b/web/cobrands/stevenage/_council_header_responsive.scss @@ -0,0 +1,93 @@ +// Overrides that make the Stevenage council header +// responsive to small screens. + +// Apologies in advance for the super-specific selectors. +// They're required to override the Stevenage styles! + +#stevenage_cc_header { + + // Make the header flexible up to 984px width. + .stv-inner, + #stv-menu #stv-primaryNavigation { + width: auto; + max-width: 984px; + } + + // Float the search and "PARF" nav links to the right, + // rather than using rigid padding-left. + #stv-header #stv-pageTools, + #stv-header .stv-parf { + padding-left: 0; + float: right; + margin-right: 10px; + } + + // The "PARF" links should break onto a new line after + // the search box, rather than floating beside it. + #stv-header .stv-parf { + clear: right; + } + + // Clear the floated search and "PARF" elements. + .stv-inner { + @include clearfix; + } + + // Menu items should be one sixth of menu width. + #stv-menu #stv-primaryNavigation { + background-color: #3f3f3f; + + ul { + display: table; + width: 100%; + + // Disable the clearfix which breaks the table layout!! + &:after { + display: none; + } + } + + li { + display: inline; + display: table-cell; + float: none; + height: auto; + + // IE7 doesn't support table-cell + .ie7 & { + display: inline; + float: left; + width: 16.65%; + } + + a { + width: auto; + padding: 6px 12px; + } + } + } + + @media (max-width: 767px) { + border-top: 1px solid #ccc; + + .stv-inner { + height: 7em; + } + + #stv-header #stv-logo { + width: 82px; + height: 45px; + } + + #stv-header .stv-mapLogo { + left: 25%; + } + + #stv-menu, + #stv-header #stv-pageTools, + #stv-header .stv-parf { + display: none; + } + } + +} diff --git a/web/cobrands/stevenage/base.scss b/web/cobrands/stevenage/base.scss index 134e97127..2bccdc377 100644 --- a/web/cobrands/stevenage/base.scss +++ b/web/cobrands/stevenage/base.scss @@ -8,5 +8,44 @@ $heading-font: 'PTSansCaptionRegular', "PT Sans Caption", Verdana, Arial, sans-s @import "../sass/base"; +#site-header { + background: #eee; + height: 4em; + margin-bottom: 1em; + + .container { + min-height: 0; + } +} + +#site-logo { + background: transparent; + width: 82px; + height: 45px; + text-indent: 0; + top: 0.6em; + left: 0.9em; +} + +#report-cta { + border-color: #ccc; + color: #000; + top: 2em; + + &:hover, &:focus { + background-color: #ddd; + } +} + +#nav-link { + top: 0.75em; +} + @import "council_header"; +@import "council_header_responsive"; +body.mappage { + #stevenage_cc_header { + display: none; + } +} diff --git a/web/cobrands/stevenage/layout.scss b/web/cobrands/stevenage/layout.scss index 48018e478..f55ac0d15 100644 --- a/web/cobrands/stevenage/layout.scss +++ b/web/cobrands/stevenage/layout.scss @@ -1,50 +1,63 @@ @import "colours"; @import "../sass/layout"; -// d523b431 - "Stevenage Home page styles" -// 2a23e09f - Moved menu on map page and reverted to full header. - // d523b431 .nav-wrapper{ .nav-wrapper-2{ + position: static; min-height: 0; // e7c122a4 / 0b0a619b / - "Removed mySociety menu and positioned menu" - top: 9.5em; border-top: none; - padding-top: 0.75em; + padding-top: 0.5em; padding-bottom: 0.25em; background-color: #6b6969; @include linear-gradient(#6b6969, #555454); + + .iel8 & { + background-color: #6b6969; + } } } +// We use absolute positioning for the header on IE7, +// because IE7 doesn't support the table-caption styles. +// This means, we need to make sure page content doesn't +// disappear behind the header. .ie6, .ie7 { - // 452ce6a0 - Added IE6/7 position change to front page header too - #stevenage_cc_header { - position:absolute; - top:0; - } - // 39ec0005 - Removed position static from nav in IE6/7 - .nav-wrapper { - .nav-wrapper-2 { - position: absolute; - } + .content { + margin-top: 10em; } - .content { - margin-top: 7em; + .frontpage { + #front-main { + margin-top: 15em; + } + + .content { + margin-top: 0; + } } } -// d523b431 +#main-nav { + @include clearfix; + width: auto; + max-width: 984px; // match the Stevenage header width + float: none; + padding-left: 0; +} + + .nav-menu { float: none; } + .nav-menu a, .nav-menu span { margin: 0; margin-right: 2px; font-family: 'PTSansRegular', "PT Sans", Verdana, Arial, sans-serif; } + .nav-menu--main { a, span { padding: 0.5em 0.75em; @@ -64,81 +77,6 @@ } } -// 452ce6a0 - "Added IE6/7 position change to front page header too" - -// turned off border for ie6-8 .content - why, as box-shadow still on? -.iel8 { - .content { - border: none; - } -} - -body.mappage { - // 15591af7 - Stevenage Map page changes - #stevenage_cc_header { - position: fixed; - } - // 2a23e09f - Moved menu on map page and reverted to full header. - .content { - margin-top: 9em; - } - // 15591af7 - Stevenage Map page changes - .nav-menu--main a, .nav-menu--main span { - padding: 0.5em 0.75em; - } - .nav-menu--main a.report-a-problem-btn { - padding: 0.5em 0.75em; - margin: 0 0 0 0.25em; - } - // 2a23e09f - Moved menu on map page and reverted to full header. - .nav-wrapper { - .nav-wrapper-2 { - position: absolute; - top: 11em; - bottom: auto; - left: 0; - width: 29em; - padding-top: 0.15em; - z-index: 0; - @include linear-gradient(#6b6969, #555454); - } - } -} - -.ie6, .ie7 { - // 82d34958 - IE6/7 Positioning Tweaks on Council header - body.mappage { - // a7a564af - Stevenage IE8 position tweak - #stevenage_cc_header { - position:absolute; - top:0; - } - // ab958bc5 - IE6/7 Tweaks - .content { - margin-top:6em; - } - .nav-wrapper { - .nav-wrapper-2 { - position: absolute; - } - } - } -} -// a7a564a - Stevenage IE8 position tweak -// 15591af7 - Stevenage Map page changes -.ie8 { - body.mappage { - #stevenage_cc_header{ - position:absolute; - top:0; - } - .nav-wrapper { - .nav-wrapper-2 { - position: absolute; - } - } - } -} - // d523b431 body.fullwidthpage { .content { @@ -176,9 +114,6 @@ body.frontpage { .nav-wrapper-2 { height: auto; } - #site-header { - height: auto; - } // 1162d5c8 - Changed the colour of the user text when you're logged in to be more readable #user-meta { p { @@ -187,6 +122,10 @@ body.frontpage { } } +#site-header { + display: none; +} + // d523b431 #front-main { background: #fff; @@ -211,25 +150,7 @@ body.frontpage { } } -// 0c5d50bc - Added margin to front page report box to push below nav in IE6/7 -.ie6, .ie7 { - #front-main { - margin-top: 5.5em; - } -} - @media only screen and (min-width: 48em) and (max-width: 61em) { - // d523b431 - #main-nav { - float: left; - padding-left: 0; - } - - .nav-wrapper { - .nav-wrapper-2 { - @include linear-gradient(#222, #555 30%, #555 60%, #222); - } - } // f432a72d - moved sticky sidebars down a bit to account for the larger header body.twothirdswidthpage { .content { @@ -241,3 +162,75 @@ body.frontpage { } } } + +body.mappage { + #site-header { + // We use the obscured #site-header to push the + // content sidebar down beyond .nav-wrapper-2 + height: 3em; + display: block; + + // For reasons beyond my comprehension, the 3em + // height results in a 3em gap in IE8. I assume + // some bug with table-cell / table-caption? + .ie8 & { + height: 0; + } + } + + // Over-specific selector required to trump _layout.scss + .nav-wrapper .nav-wrapper-2 { + position: absolute; + top: 0; + padding: 0; + height: 4em; + background: #fff url("http://www.stevenage.gov.uk/Images/headerBG.jpg") repeat-x bottom left; + } + + #site-logo { + position: absolute; + top: 0.5em; + } + + #main-nav { + float: right; + margin-right: 1em; + margin-top: 1em; + } + + // again, !important to override _layout.scss + .nav-menu--main a, + .nav-menu--main span, + .report-a-problem-btn { + padding: 0.5em 0.75em 0.4em 0.75em !important; + margin: 0 !important; + } + + .nav-menu a { + color: #000; + } + + .nav-menu a:hover, + .nav-menu a:focus, + a.report-a-problem-btn { + color: #fff; + } + + // _layout.scss adds 4em of padding to leave space for + // an absolutely positioned menu, but I can't tell what + // that means. Stevenage, at least, doesn't need it. + .wrapper { + .ie7 & { + padding-top: 0; + } + } + + // Not sure why IE7 has the old style of "inset" or "floating" + // sidebar on the map page, but this makes it stop! + .container { + .ie7 & { + margin-left: 0; + } + } + +} |
