diff options
| -rwxr-xr-x | templates/web/oxfordshire/faq/faq-en-gb.html | 319 | ||||
| -rw-r--r-- | templates/web/oxfordshire/footer.html | 3 | ||||
| -rw-r--r-- | templates/web/oxfordshire/header.html | 52 | ||||
| -rw-r--r-- | templates/web/oxfordshire/report/new/councils_text_all.html | 21 | ||||
| -rw-r--r-- | web/cobrands/oxfordshire/_colours.scss | 5 | ||||
| -rw-r--r-- | web/cobrands/oxfordshire/base.scss | 9 | ||||
| -rw-r--r-- | web/cobrands/oxfordshire/layout.scss | 29 | ||||
| -rw-r--r-- | web/cobrands/oxfordshire/oxfordshire.scss | 126 |
8 files changed, 335 insertions, 229 deletions
diff --git a/templates/web/oxfordshire/faq/faq-en-gb.html b/templates/web/oxfordshire/faq/faq-en-gb.html index 9361d5647..4198b0cd2 100755 --- a/templates/web/oxfordshire/faq/faq-en-gb.html +++ b/templates/web/oxfordshire/faq/faq-en-gb.html @@ -13,71 +13,70 @@ </div> <h1><a name="faq"></a>Frequently Asked Questions</h1> - <dl> - <dt>What is FixMyStreet?</dt> - <dd> - <p> - FixMyStreet is a site to help people report, view, -or discuss local problems they’ve found to their local council by -simply locating them on a map. It launched in early February -2007. - </p> - <p> - We have now integrated with the Oxfordshire County Council website - to make it easier to report highways faults. - </p> - </dd> - - <dt>What sort of problems should I report with FixMyStreet?</dt> - <dd> - <p> - FixMyStreet is primarily for reporting things which are -<strong>broken or dirty or damaged or dumped, and need fixing, cleaning -or clearing</strong>, such as: - </p> - - <ul><li>Abandoned vehicles - <li>Dog Fouling - <li>Flyposting or graffiti - <li>Flytipping or litter - <li>Streetcleaning, such as broken glass in a cycle lane - <li>Unlit lamposts - <li>Potholes - </ul> +<dl> + <dt>What is FixMyStreet?</dt> + <dd> + <p> + FixMyStreet is an easy to use web site to help people report, view, or discuss + local problems to their council by simply locating them on a map. + </p> + <p> + We have now integrated FixMyStreet with the Oxfordshire County Council website + to make it easier for our customers to report highways faults directly to us by + using their computer or mobile phone. + </p> </dd> - <dt>What isn’t FixMyStreet for?</dt> + <dt>What sort of problems should I report with FixMyStreet?</dt> <dd> - <p> - FixMyStreet is not a way of getting in touch with the council for all - issues – please use FixMyStreet only for problems such as the above. We - often route problem reports via cleansing services or highways and so using - FixMyStreet for other matters may result in a delay in your report getting - to the right department. - </p> - <div style="margin-left:1.5em;"> <p> - <strong>You will need to contact the county council directly for</strong>: + FixMyStreet is primarily for reporting things which are broken or dirty, damaged + or dumped, and need fixing, cleaning or clearing, such as: </p> <ul> - <li>Any urgent or emergency problems - <li>Complaining about the council - <li>Proposals for speed bumps/ CCTV/ pedestrian crossings/ new road layouts/ etc. + <li>Abandoned vehicles + <li>Dog Fouling + <li>Flyposting or graffiti + <li>Flytipping or litter + <li>Streetcleaning, such as broken glass in a cycle lane + <li>Unlit lampposts + <li>Potholes </ul> + </dd> + <dt>What isn’t FixMyStreet for?</dt> + <dd> <p> - <strong>You will need to contact your district council directly for problems such as:</strong>: + FixMyStreet is not a way of getting in touch with the council for all issues — please use + FixMyStreet only for problems highlighted above. </p> - <ul> - <li>Anti-social behaviour - <li>Noise pollution or barking dogs - <li>Fires and smoke/smell pollution - <li>Missing wheelie bins or recycling boxes or missed rubbish collections - <li>Proposals for speed bumps/ CCTV/ pedestrian crossings/ new road layouts/ etc. - <li>Complaining about your neighbours - <li>Joy riding, drug taking, animal cruelty, or other criminal activity - </ul> - </div> + <p> + As we often route problems via our cleansing services or highways departments, using FixMyStreet + for other matters may result in a delay in your report getting to the right people. + </p> + <div style="margin-left:1.5em;"> + <p> + <strong>You will need to contact the county council directly for</strong>: + </p> + <ul> + <li>Any urgent or emergency problems + <li>Complaining about the council + <li>Proposals for speed bumps/ CCTV/ pedestrian crossings/ new road layouts/ etc. + </ul> + <p> + <strong>You will need to contact your district council directly for problems such as:</strong>: + </p> + <ul> + <li>Anti-social behaviour + <li>Noise pollution or barking dogs + <li>Fires and smoke/smell pollution + <li>Missing wheelie bins or recycling boxes or missed rubbish collections + <li>Proposals for speed bumps/ CCTV/ pedestrian crossings/ new road layouts/ etc. + <li>Complaining about your neighbours + <li>Joy riding, drug taking, animal cruelty, or other criminal activity + </ul> + </div> </dd> + <dt><a name="pothole"></a>Should I report a pothole on this site, or call?</dt> <dd> <p><strong>You must call us on 0845 310 1111 to report the pothole if it is:</strong></p> @@ -90,143 +89,105 @@ or clearing</strong>, such as: </ul> </dd> - <dt>How do I use the site?</dt> - <dd>After entering a postcode or location, you are presented -with a map of that area. You can view problems already reported in that area, -or report ones of your own simply by clicking on the map at the location of -the problem.</dd> + <dt>How do I use the FixMyStreet site?</dt> + <dd> + After entering a postcode or location, you will then be presented with a map of that area. + You can then view problems already reported in that area, or report new ones of your own + simply by clicking on the map at the location of the problem. + </dd> - <dt>How are the problems solved?</dt> - <dd>They are reported to the council by email. The -council can then resolve the problem the way they normally would. -Alternatively, you can discuss the problem on the website with others, and -then together lobby the council to fix it, or fix it directly yourselves.</dd> + <dt>How are the problems solved?</dt> + <dd> + They are reported to us automatically. We then resolve the problem the way we + normally would and update the fault on the map. + </dd> - <dt>What updates will I receive?</dt> - <dd>If you sign up to receive updates you will receive an email to acknowledge the report, an email when the problem is assigned to a representative to be inspected, one if the problem is either referred to the appropriate organisation and one when it is fixed.</dd> + <dt>What does the map show?</dt> + <dd> + The map shows all faults submitted online through FixMyStreet. You can view the + exact location of each fault and see its current status. + </dd> - <dt>Is it free?</dt> - <dd>The site is free to use, yes. FixMyStreet is run -by a registered charity, though, so if you want to make a contribution, <a -href="https://secure.mysociety.org/donate/">please do</a>.</dd> + <dt>How can I get an update on a fault?</dt> + <dd> + <p> + When you record a fault you can sign up to receive updates. You will then receive + an initial email to acknowledge the report. In time, you will receive a further email + when the problem is assigned for inspection, one if the problem needs to be referred + to another department or organisation, and a final email when it is fixed or requires + no further work. + </p> + <p> + These updates will also be posted on the mapped fault so that anyone can see the + status of any fault recorded via FixMyStreet by clicking on it on the map. + </p> + </dd> <dt>Can I use FixMyStreet on my mobile?</dt> <dd> - <p>The FixMyStreet website should work on your mobile phone, adapting to - the size of your screen automatically. We plan to release updated native - apps in the near future. - <ul> - <li><em>iPhone:</em> Our basic app from 2008 is available for download - on the App Store: - <a href="http://itunes.apple.com/gb/app/fixmystreet/id297456545">FixMyStreet</a>, - <li><em>Android:</em> A volunteer, Anna Powell-Smith, has written an app - available from the - <a href="https://market.android.com/details?id=com.android.fixmystreet">Android Market</a>. - <li><em>Nokia:</em> A volunteer, Thomas Forth, has written an app available from the - <a href="http://store.ovi.com/content/107557">Ovi Store</a>. - </ul> + <p> + Yes, you can view our website on your phone and it will automatically adapt ] + to the size of your screen. + </p> + <p> + The following apps are also available for the national FixMyStreet site, + and they plan to release updated native apps in the near future. + </p> + <ul> + <li><em>iPhone:</em> Our basic app from 2008 is available for download + on the App Store: + <a href="http://itunes.apple.com/gb/app/fixmystreet/id297456545">FixMyStreet</a>, + <li><em>Android:</em> A volunteer, Anna Powell-Smith, has written an app + available from the + <a href="https://market.android.com/details?id=com.android.fixmystreet">Android Market</a>. + <li><em>Nokia:</em> A volunteer, Thomas Forth, has written an app available from the + <a href="http://store.ovi.com/content/107557">Ovi Store</a>. + </ul> </dd> +</dl> - </dl> - - <h2><a name="practical"></a>Practical Questions</h2> - <p> - <em>Taken from the national website <a href="http://www.fixmystreet.com">www.fixmystreet.com</a></em> - </p> - <dl> - <dt>Do you remove silly or illegal content?</dt> - <dd>FixMyStreet is not responsible for the content and accuracy -of material submitted by its users. We reserve the right to edit or remove any -problems or updates which we consider to be inappropriate upon being informed -by a user of the site.</dd> +<h2><a name="practical"></a>Practical Questions</h2> +<dl> + <dt>Do you remove silly or illegal content?</dt> + <dd> + Oxfordshire County Council and FixMyStreet are not responsible for the content and + accuracy of material submitted by its users. We reserve the right to edit or remove + any problems or updates which we consider to be inappropriate upon being informed + by a user of the site. + </dd> <dt>Why does the site use kilometres for measurements?</dt> - <dd>Thanks for asking politely – we never quite understand why some of the rudest - emails we receive are on this topic. The British national - grid reference system, devised by Ordnance Survey (the British national - mapping agency) around the time of the second world war, uses eastings and - northings measured in metres and kilometres; the maps we use are from - Ordnance Survey and so this is what we use to display distances. - There you have it: not everything British is in miles!</dd> + <dd> + The maps FixMyStreet uses are from Ordnance Survey who based their grid reference + system on measurements in metres and kilometres. + </dd> - <dt>Why can’t I zoom out more on the reporting map?</dt> - <dd>We want to keep FixMyStreet locally focused, so restrict the ability to - move radically between areas. The map on Your Reports will let you see all - the reports you’ve made, wherever they are. If you’re from the - council then the emailed version of the problem report also contains the - closest road and postcode to the pin on the map.</dd> + <dt>How do I report a fault outside of Oxfordshire?</dt> + <dd> + The map only shows locations within Oxfordshire to keep it locally focussed. + You can report a fault outside of Oxfordshire on the national + <a href="http://www.fixmystreet.com/">FixMyStreet</a> website. + </dd> +</dl> - <dt>This site is great – why aren’t you better publicised?</dt> - <dd>As a tiny charity we simply don’t have a publicity budget, and we - rely on word of mouth to advertise the site. We have a whole <a - href="posters/">array of posters, flyers and badges</a> if you’d like - to publicise us on the web or in your local area, and why not write to your - local paper to let them know about us?</dd> </dl> - - <h2><a name="organisation"></a>Organisation Questions</h2> - <p> - <em>Taken from the national website <a href="http://www.fixmystreet.com">www.fixmystreet.com</a></em> - </p> - <dl> - <dt>Who built FixMyStreet?</dt> - <dd>This site was built by <a href="http://www.mysociety.org/">mySociety</a>, +<h2><a name="organisation"></a>Organisation Questions</h2> +<dl> + <dt>Who built FixMyStreet?</dt> + <dd> + This site was built by <a href="http://www.mysociety.org/">mySociety</a>, in conjunction with the <a href="http://www.youngfoundation.org.uk/">Young Foundation</a>. -mySociety is the project of a registered charity which has grown out of the community of -volunteers who built sites like <a href="http://www.theyworkforyou.com/">TheyWorkForYou.com</a>. -mySociety’s primary mission is to build Internet projects which give people simple, tangible -benefits in the civic and community aspects of their lives. Our first project -was <a href="http://www.writetothem.com/">WriteToThem</a>, where you can write to any of your -elected representatives, for free. The charity is called UK Citizens Online Democracy and is charity number 1076346. mySociety -can be contacted by email at <a href="mailto:hello@mysociety.org">hello@mysociety.org</a>, -or by post at mySociety, 483 Green Lanes, London, N13 4BS, UK.</dd> - <dt><img src="/i/moj.png" align="right" alt="Ministry of Justice" hspace="10">Who pays for it?</dt> - <dd>FixMyStreet was originally paid for via the Department for - Constitutional Affairs Innovations Fund. It is now funded by a variety of means, from commercial - work to <a href="http://www.mysociety.org/donate/">donations</a>.</dd> - <dt><a name="nfi"></a>Wasn’t this site called Neighbourhood Fix-It?</dt> - <dd>Yes, we changed the name mid June 2007. We decided -Neighbourhood Fix-It was a bit of a mouthful, hard to spell, and hard to publicise (does the URL have a dash in it or not?). The domain FixMyStreet became available, and everyone liked the name.</dd> - <dt>Do you need any help with the project?</dt> - <dd>Yes, we can use help in all sorts of ways, technical or -non-technical. Please see our <a -href="http://www.mysociety.org/helpus/">Get Involved page</a>.</dd> - <dt>I’d like a site like this for my own location/ where’s the "source code" to this site?</dt> - <dd> -The software behind this site is open source, and available -to you mainly under the GNU Affero GPL software license. You can <a -href="http://github.com/mysociety/fixmystreet">download the -source code</a> and help us develop it. -You’re welcome to use it in your own projects, although you must also -make available the source code to any such projects. -<a href="http://www.fiksgatami.no/">Fiksgatami</a> is an example of our code -being used in a Norwegian version of this site. -</dd> -<dt>I’d prefer code in a different language?</dt> -<dd> -VisibleGovernment.ca wrote their own code for -<a href="http://www.fixmystreet.ca/">http://www.fixmystreet.ca/</a>, which is -written in GeoDjango and available under an MIT licence at <a -href="http://github.com/visiblegovernment/django-fixmystreet/tree/master">github</a>. -Or <a href="http://www.fixmystreet.org.nz/">FixMyStreet.org.nz</a> is written in -Drupal. + mySociety is the project of a registered charity which has grown out of the community of + volunteers who built sites like <a href="http://www.theyworkforyou.com/">TheyWorkForYou.com</a>. + mySociety’s primary mission is to build Internet projects which give people simple, tangible + benefits in the civic and community aspects of their lives. Their first project + was <a href="http://www.writetothem.com/">WriteToThem</a>, where you can write to any of your + elected representatives, for free. The charity is called UK Citizens Online Democracy and is charity + number 1076346. + </dd> +</dl> +<p> + You can find out more about FixMyStreet at <a href="http://www.fixmystreet.com">www.fixmystreet.com</a>. </p> -</dd> - <dt>People build things, not organisations. Who <em>actually</em> built it?</dt> - <dd>Matthew Somerville and Francis Irving wrote the site, -Chris Lightfoot wrote the tileserver and map cutter, Richard Pope created -our pins, Deborah Kerr keeps things up-to-date and does user support, -Ayesha Garrett designed our posters, and Tom Steinberg managed it all. - -Thanks also to -<a href="http://www.ordnancesurvey.co.uk">Ordnance Survey</a> (for the maps, -UK postcodes, and UK addresses – data © Crown copyright, all -rights reserved, Ministry of Justice 100037819 2008), -Yahoo! for their BSD-licensed JavaScript libraries, the entire free software -community (this particular project was brought to you by Perl, PostgreSQL, -and the number 161.290) and <a -href="http://www.bytemark.co.uk/">Bytemark</a> (who kindly host all -our servers). +<p> <p> -Let us know if we’ve missed anyone.</dd> - </dl> [% INCLUDE 'footer.html' pagefooter = 'yes' %] diff --git a/templates/web/oxfordshire/footer.html b/templates/web/oxfordshire/footer.html index cfca706c8..ffe32a4a1 100644 --- a/templates/web/oxfordshire/footer.html +++ b/templates/web/oxfordshire/footer.html @@ -38,9 +38,6 @@ <a href="http://www.oxfordshire.gov.uk/cms/public-site/contact-oxfordshire-county-council" title="Contac the council">Contact the council</a> </address> <ul><!-- use | between items --> - <li> - <a href="/contact" title="Contact the FixMyStreet team">Contact</a> | - </li> <li class="powered-by-fms"> <a href="http://www.fixmystreet.com/">Powered by <img src="/cobrands/oxfordshire/images/fms-logo-inverse.png" alt="FixMyStreet"></a> </li> diff --git a/templates/web/oxfordshire/header.html b/templates/web/oxfordshire/header.html index 6c338452a..e9a592fd4 100644 --- a/templates/web/oxfordshire/header.html +++ b/templates/web/oxfordshire/header.html @@ -34,7 +34,7 @@ </head> <body class="[% bodyclass | html IF bodyclass %]"> <div id="oxford-wrapper"> - <div id="oxford-header" class="desk-only"> + <div id="oxford-header" class="desk-only oxford-left"> <a href="http://www.oxfordshire.gov.uk/" title="Home" class="logo">Oxfordshire County Council<span></span></a> <span id="oxford-links"> <a href="http://www.oxfordshire.gov.uk/" title="">Oxfordshire County Council home</a>|<a href="/" title="">FixMyStreet</a> @@ -49,21 +49,51 @@ [% END %] </p> </div> + + + <div id="navigation"> + <div class="menubar"> + <div class="menu-inner"> + <ul class="menu"> + <li> + <[% IF c.req.uri.path == '/' %]span[% ELSE %]a href="/"[% END %]>[% "Report" %]</[% c.req.uri.path == '/' ? 'span' : 'a' %]> + </li> + <li> + <[% IF c.req.uri.path == '/my' OR ( c.req.uri.path == '/auth' AND c.req.params.r == 'my' ) %]span[% ELSE %]a href="/my"[% END + %]>[% loc("Your reports") %]</[% ( c.req.uri.path == '/my' OR ( c.req.uri.path == '/auth' AND c.req.params.r == 'my' ) ) ? 'span' : 'a' %]> + </li> + <li> + <[% IF c.req.uri.path == '/reports/Oxfordshire' %]span[% ELSE %]a href="/reports/Oxfordshire"[% END + %]>[% 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 + %]>[% loc("Help") %]</[% c.req.uri.path == '/faq' ? 'span' : 'a' %]> + </li> + </ul> + </div> + </div> + </div> + + + + </div> <!-- end of oxford header --> +<!-- <div id="oxford-main-menu" class="desk-only"> <ul class="tabs"> - <li class="home first"><[% IF c.req.uri.path == '/' %]span[% ELSE %]a href="/"[% END %] class="report-a-problem-btn" - >[% "Report" %]</[% c.req.uri.path == '/' ? 'span' : 'a' %]></li>[% - %]<li><[% IF c.req.uri.path == '/my' OR ( c.req.uri.path == '/auth' AND c.req.params.r == 'my' ) %]span[% ELSE %]a href="/my"[% END - %]>[% loc("Your reports") %]</[% ( c.req.uri.path == '/my' OR ( c.req.uri.path == '/auth' AND c.req.params.r == 'my' ) ) ? 'span' : 'a' %]></li>[% - %]<li><[% IF c.req.uri.path == '/reports/Oxfordshire' %]span[% ELSE %]a href="/reports/Oxfordshire"[% END - %]>[% 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 class="last"><[% IF c.req.uri.path == '/faq' %]span[% ELSE %]a href="/faq"[% END - %]>[% loc("Help") %]</[% c.req.uri.path == '/faq' ? 'span' : 'a' %]></li> + <li class="home first"></li>[% + %]<li></li>[% + %]<li></li>[% + %]<li></li>[% + %]<li class="last"></li> </ul> </div> +--> <div class="wrapper"> diff --git a/templates/web/oxfordshire/report/new/councils_text_all.html b/templates/web/oxfordshire/report/new/councils_text_all.html index e71a400ac..a7babd2db 100644 --- a/templates/web/oxfordshire/report/new/councils_text_all.html +++ b/templates/web/oxfordshire/report/new/councils_text_all.html @@ -1,3 +1,17 @@ +<div class="oxfordshire-preamble"> + <p> + Please <strong>do not</strong> use this form for reporting + <strong>emergencies and urgent</strong> problems. + You should report these by contacting 0845 310 11 11. + </p> + <p> + Our opening hours are 8.30 to 5, Monday to Thursday and 8.30 to 4 on Fridays. + </p> + If your enquiry is related to Highways and is outside of our opening hours and + cannot wait, please contact Thames Valley Police on 101. + </p> +</div> + <p>You can use this form to report a problem or to make an enquiry about roads and pavements in your area. All the information you provide here will be sent to <strong>[% all_council_names.join( '</strong> or <strong>' ) %]</strong>. @@ -5,13 +19,6 @@ The subject and details of the problem will be public, plus your name if you give us permission. If you report a fault on a road that is not owned by Oxfordshire County Council we will pass the report on to the relevant body. -<p>Our opening hours are 8.30 to 5, Monday to Thursday and 8.30 to 4 on -Fridays. Please <strong>do not</strong> use this form for reporting -<strong>emergencies and urgent</strong> problems. You should report these by -contacting 0845 310 11 11. If your enquiry is related to Highways and is -outside of our opening hours and cannot wait, please contact Thames Valley -Police on 101.</p> - <p>Please use <a href="/faq#pothole" target="_blank">our chart</a> to determine the size of any pot holes being reported and whether to submit a report using this online form or by telephone.</p> diff --git a/web/cobrands/oxfordshire/_colours.scss b/web/cobrands/oxfordshire/_colours.scss index 0179bdbe4..eea046781 100644 --- a/web/cobrands/oxfordshire/_colours.scss +++ b/web/cobrands/oxfordshire/_colours.scss @@ -13,4 +13,9 @@ $col_click_map_dark: $primary_text; $col_fixed_label: $oxfordshire_lt_green; $col_fixed_label_dark: $primary_text; +// Oxfordshire have toasty orange buttons +$oxfordshire_button_base: #F35A0E; +$oxfordshire_button_top: #EC6816; +$oxfordshire_button_bottom: #FE4602; +$oxfordshire_button_border: #CCC; diff --git a/web/cobrands/oxfordshire/base.scss b/web/cobrands/oxfordshire/base.scss index 10e5c5711..d3ba888d9 100644 --- a/web/cobrands/oxfordshire/base.scss +++ b/web/cobrands/oxfordshire/base.scss @@ -37,4 +37,11 @@ height: 20px; width: 105px; } -}
\ No newline at end of file +} + +.oxfordshire-preamble { + background: #E0E0E0; + margin: 0em auto 1em auto; + padding: 1em 1em 0.5em 1em; +} + diff --git a/web/cobrands/oxfordshire/layout.scss b/web/cobrands/oxfordshire/layout.scss index 8d5710158..19a4f7ea6 100644 --- a/web/cobrands/oxfordshire/layout.scss +++ b/web/cobrands/oxfordshire/layout.scss @@ -6,6 +6,10 @@ body { background-image: none; } +body, body a { + font-family:"Trebuchet MS",Arial, Helvetica, sans-serif; +} + #front-main { background-color: $primary; background-image: none; @@ -150,5 +154,30 @@ body.twothirdswidthpage .content { } } +#front-main #postcodeForm div { + border: 1px solid #fff; // because orange "Go" button (see below) abuts this border, looks a tiny bit better if it's not dark green +} + +// styled Oxfordshire buttons -- including the "Go" button on the postcode form -- to be orange: + +#front-main #postcodeForm div input#submit, +.green-btn, +button.green-btn, +input.green-btn{ + @include button-reset( + $oxfordshire_button_top, $oxfordshire_button_bottom, $oxfordshire_button_border, #fff, + $oxfordshire_button_top, $oxfordshire_button_bottom, $oxfordshire_button_border, #fff + ); + text-transform:capitalize; + -webkit-border-radius: 4px; + -moz-border-radius: 4px; + border-radius: 4px; + -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); + -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); + box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); + font-weight: normal; + cursor: pointer; +} @import "oxfordshire"; diff --git a/web/cobrands/oxfordshire/oxfordshire.scss b/web/cobrands/oxfordshire/oxfordshire.scss index 0429a622b..d6b31586c 100644 --- a/web/cobrands/oxfordshire/oxfordshire.scss +++ b/web/cobrands/oxfordshire/oxfordshire.scss @@ -9,7 +9,7 @@ body { font-family:"Trebuchet MS",Arial, Helvetica, sans-serif; line-height:18px; - a {text-decoration:none; outline:0; font-family:Arial, Helvetica, sans-serif; font-size:0.75em; color:#0c62ba} + a {text-decoration:none; color:#0c62ba} a { font-size: 1em; } // mySociety a:hover {text-decoration:underline} margin:0; @@ -26,34 +26,43 @@ body { } -#oxford-header - { - padding:0 16px 7px 16px; - clear:both; - overflow:hidden; - position:relative; - width:958px; - height:84px; - height:auto !important; - min-height:84px; - background: $oxfordshire_lt_green url("/cobrands/oxfordshire/images/header.jpg") no-repeat 0 0; - - a.logo:hover {cursor:pointer;cursor:hand} - a.logo {float:left; display:inline; margin:3px 0 6px 10px; position:relative; overflow:hidden} - a.logo span {display:block; position:absolute; top:0; left:0; z-index:10} - a.logo, a.logo span {width:173px; height:38px; background: url("/cobrands/oxfordshire/images/logo.jpg") no-repeat 0 0;} - - h1 {float:left; padding:8px 0 0 10px; margin:0; font-size:1.25em; line-height:normal; font-weight:bold; color:#ffffff; white-space:nowrap;font-family:"Trebuchet MS",Tahoma,Arial,sans-serif;} - span.header {float:left; padding:8px 0 0 10px; margin:0; font-size:1.25em; line-height:normal; font-weight:bold; color:#ffffff; white-space:nowrap} - a {color:#ffffff;} - - #oxford-links { - padding: 10px 3px 0px 0px; float:right;color:#ffffff; - a{ +#oxford-header { + padding:0 16px 7px 16px; + clear:both; + overflow:hidden; + position:relative; + width:958px; + + /* note================= */ + height: 133px; + height:auto !important; + min-height:133px; + /* note================= */ + + background: $oxfordshire_lt_green url("/cobrands/oxfordshire/images/header.jpg") no-repeat 0 0; + + a.logo:hover {cursor:pointer;cursor:hand} + a.logo {float:left; display:inline; margin:3px 0 6px 10px; position:relative; overflow:hidden} + a.logo span {display:block; position:absolute; top:0; left:0; z-index:10} + a.logo, a.logo span {width:173px; height:38px; background: url("/cobrands/oxfordshire/images/logo.jpg") no-repeat 0 0;} + + h1 { + float:left; padding:8px 0 0 10px; margin:0; font-size:1.25em; line-height:normal; + font-weight:bold; color:#ffffff; white-space:nowrap;font-family:"Trebuchet MS",Tahoma,Arial,sans-serif; + } + span.header { + float:left; padding:8px 0 0 10px; margin:0; font-size:1.25em; line-height:normal; font-weight:bold; + color:#ffffff; white-space:nowrap + } + a { + color:#ffffff; + } + #oxford-links { + padding: 10px 3px 0px 0px; float:right;color:#ffffff; + a { font-size:0.75em; // mySociety putting this back (switched off in body) margin: 0px 5px 0px 5px } - } .oxford-user { float: right; @@ -142,10 +151,8 @@ body { li.last a {border-right:1px solid #666;} a {padding:8px 0 0 0;} } - } - #oxford-footer { float:left; display:inline; @@ -182,3 +189,66 @@ body { } } + /* --------------------------------------------------------------------------------- + oxfordshire nav menubar from e.g., + http://fisd.oxfordshire.gov.uk/kb5/oxfordshire/fsd/includes/css/wireframe/navbar.css + ---------------------------------------------------------------------------------*/ + +#navigation { + position: absolute; + left: 0; + top: 90px; + .menubar { + width: 972px; + padding: 0 0 0 18px; + border-top: 1px solid #004300; + font-size: 13px; /* explicit; it was implicit from OCC's styles */ + color: #999999; + overflow: visible; + /*width: @gridWidth; only needed for contained menu*/ + display: inline-block; + z-index: 100; + .menu-inner { + background-color: #004300; + background-repeat: repeat-x; + -webkit-border-radius: 0; + -moz-border-radius: 0; + border-radius: 0; + box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), 0 -1px 0 rgba(0, 0, 0, 0.1) inset; + .menu { + left: 0; + margin: 0 10px 0 0; + padding: 0; + position: relative; + list-style: none outside none; + > li { + list-style: none outside none; + float: left; + > a, > span { + color: #ffffff; + float: none; + line-height: 19px; + padding: 10px 10px 11px; + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); + display: block; + text-decoration: none; + &:hover { + color: #FFFFFF; + } + } + } + } + } + } + .menubar-fixed-top { + left: 0; + margin-bottom: 0; + position: fixed; + right: 0; + z-index: 1000; + } +} +.oxford-left { + float: left !important; +} + |