aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--templates/web/bromley/footer.html4
-rw-r--r--templates/web/bromley/header.html19
-rwxr-xr-xtemplates/web/default/reports/council.html14
-rw-r--r--web/cobrands/bromley/base.scss22
-rw-r--r--web/cobrands/bromley/bromley.scss26
-rw-r--r--web/cobrands/bromley/layout.scss22
-rw-r--r--web/cobrands/fixmystreet/_layout.scss1
7 files changed, 86 insertions, 22 deletions
diff --git a/templates/web/bromley/footer.html b/templates/web/bromley/footer.html
index 4959e15a4..da77b1756 100644
--- a/templates/web/bromley/footer.html
+++ b/templates/web/bromley/footer.html
@@ -27,13 +27,13 @@
</div> <!-- .wrapper -->
-<div id="bromley-footer">
+<div id="bromley-footer" class="desk-only">
<p class="copy">&copy; 2012 London Borough of Bromley</p>
<a href="http://www.direct.gov.uk/"><img src="http://www.bromley.gov.uk/site/images/directgov.jpg" alt="Directgov website link - Public services all in one place" /></a>
<ul class="footer-nav">
- <li><a href="#header">To the top</a></li>
+ <li><a href="#bromley-header">To the top</a></li>
<li><a href="http://www.bromley.gov.uk/terms">Disclaimer</a></li>
<li><a href="http://www.bromley.gov.uk/privacy" rel="nofollow">Privacy and cookies</a></li>
<li><a href="http://www.bromley.gov.uk/accesstoinfo">Access to information</a></li>
diff --git a/templates/web/bromley/header.html b/templates/web/bromley/header.html
index f64997070..91738bf5a 100644
--- a/templates/web/bromley/header.html
+++ b/templates/web/bromley/header.html
@@ -6,7 +6,6 @@
<!--[if gt IE 9]><!--><html class="no-js" lang="[% lang_code %]"><!--<![endif]-->
<head>
<meta name="viewport" content="initial-scale=1.0">
-
<meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
<meta name="HandHeldFriendly" content="true">
<meta name="mobileoptimized" content="0">
@@ -23,21 +22,17 @@
[% INCLUDE 'common_header_tags.html', js_override = '/cobrands/bromley/fixmystreet.js' %]
<script src="[% version('/js/fancybox/jquery.fancybox-1.3.4.pack.js') %]" charset="utf-8"></script>
- [% IF c.req.uri.host == 'osm.fixmystreet.com' %]
- <link rel="canonical" href="http://www.fixmystreet.com[% c.req.uri.path_query %]">
- [% END %]
-
- [% INCLUDE 'tracking_code.html' %]
+ <link rel="Shortcut Icon" type="image/x-icon" href="/cobrands/bromley/favicon.ico">
</head>
<body class="[% bodyclass | html IF bodyclass %]">
-<div id="bromley-header">
+<div id="bromley-header" class="desk-only">
<ul class="header-nav">
<li><a href="http://www.bromley.gov.uk/accessibility">Accessibility</a></li>
- <li><a class="skiplink" href="http://www.bromley.gov.uk/a_to_z#content" rel="nofollow">Skip to content</a></li>
- <li><a rel="nofollow" href="http://www.bromley.gov.uk/a_to_z?previewstyle=generic/print.css">Printer friendly</a></li>
- <li><a href="http://www.bromley.gov.uk/accessibility/settings">Text size: AAA</a></li>
+ <li><a class="skiplink" href="http://www.bromley.gov.uk/#user-meta" rel="nofollow">Skip to content</a></li>
+ <!-- <li><a rel="nofollow" href="http://www.bromley.gov.uk/a_to_z?previewstyle=generic/print.css">Printer friendly</a></li> -->
+ <!-- <li><a href="http://www.bromley.gov.uk/accessibility/settings">Text size: AAA</a></li> -->
<li><div id="google_translate_element"></div></li>
</ul>
@@ -45,12 +40,12 @@
<a href="http://www.bromley.gov.uk"><img src="http://www.bromley.gov.uk/site/images/bromley-logo.jpg" alt="London Borough of Bromley logo" /></a>
</div>
- <div class="sign-in">
+ <!-- <div class="sign-in">
<p>
You are not signed in. <a href="https://www.bromley.gov.uk/sign_in?referer=%2fa_to_z">Sign in</a>
or <a href="https://www.bromley.gov.uk/register">register</a>?
</p>
- </div>
+ </div> -->
<div class="main-menu">
<ul>
diff --git a/templates/web/default/reports/council.html b/templates/web/default/reports/council.html
index 0d3d43d82..4eef35dec 100755
--- a/templates/web/default/reports/council.html
+++ b/templates/web/default/reports/council.html
@@ -1,3 +1,9 @@
+[% IF c.cobrand.moniker == 'fixmystreet' OR c.cobrand.moniker == 'bromley';
+ style = 'new';
+ ELSE;
+ style = 'old';
+ END;
+%]
[% IF ward %]
[% name = "$ward.name, $council.name"
thing = loc('ward')
@@ -19,7 +25,7 @@
[% map_html %]
-[% IF c.cobrand.moniker != 'fixmystreet' AND children.size %]
+[% IF style != 'new' AND children.size %]
<h2 style="clear:right">[% loc('Wards of this council') %]</h2>
<p>[% loc('Follow a ward link to view only reports within that ward.') %]</p>
<ul>
@@ -66,7 +72,7 @@ Its area is now covered by <a href="/reports/Bedford">Bedford Borough Council</a
<a href="/reports/Central+Bedfordshire">Central Bedfordshire Council</a>.
[% END %]
</p>
-[% ELSIF c.cobrand.moniker == 'fixmystreet' %]
+[% ELSIF style == 'new' %]
<div class="shadow-wrap">
<ul id="key-tools"[% IF NOT children.size %] class="singleton"[% END %]>
<li><a rel="nofollow" id="key-tool-updates-area" class="feed" href="[% rss_url %]">[% tprintf(loc('Get updates of problems in this %s'), thing) %]</a></li>
@@ -81,7 +87,7 @@ Its area is now covered by <a href="/reports/Bedford">Bedford Borough Council</a
[% TRY %][% INCLUDE 'reports/cobrand_stats.html' %][% CATCH file %][% END %]
-[% IF c.cobrand.moniker == 'fixmystreet' AND children.size %]
+[% IF style == 'new' AND children.size %]
<section id="council_wards" class="hidden-js">
<h2>[% loc('Wards of this council') %]</h2>
<p>[% loc('Follow a ward link to view only reports within that ward.') %]</p>
@@ -117,7 +123,7 @@ Its area is now covered by <a href="/reports/Bedford">Bedford Borough Council</a
[% IF problems %]
<ul class="issue-list-a">
-[% IF c.cobrand.moniker == 'fixmystreet' %]
+[% IF style == 'new' %]
[% FOREACH problem IN problems %]
<li>
diff --git a/web/cobrands/bromley/base.scss b/web/cobrands/bromley/base.scss
index 4594f832f..710078118 100644
--- a/web/cobrands/bromley/base.scss
+++ b/web/cobrands/bromley/base.scss
@@ -5,3 +5,25 @@
@import "../fixmystreet/_base";
+// Want a white header, and logo is slightly bigger
+#site-header {
+ @include background(linear-gradient(#ddd, #fff 10%, #fff));
+ height: 4em;
+}
+
+// Colour tab to match colour scheme
+#nav-link {
+ width: 50px;
+ height: 48px;
+ background: url('/cobrands/bromley/tab-blue.png') 0 0 no-repeat;
+}
+
+// Change logo to logo of council
+#site-logo {
+ display: block;
+ width: 80px;
+ height: 44px;
+ top: 0.9em;
+ background: url('/cobrands/bromley/bromley-logo.s.jpg') 0 0 no-repeat;
+}
+
diff --git a/web/cobrands/bromley/bromley.scss b/web/cobrands/bromley/bromley.scss
index 6e56bb482..5673df8ad 100644
--- a/web/cobrands/bromley/bromley.scss
+++ b/web/cobrands/bromley/bromley.scss
@@ -1,7 +1,15 @@
+/* Parts of Bromley's main CSS needed for its header/footer and adjusted (see
+ * bottom) to not be affected by main FixMyStreet CSS. Not very sustainable;
+ * perhaps we should wrap all council CSS within a SCSS #council ID? Hmm.
+ */
+
+@import "compass";
+
h1, h2, h3, h4, h5, h6, legend { font-family: 'Gill Sans', 'Trebuchet MS', Calibri, sans-serif; }
body { color: #333; font-family: Arial, 'Helvetica Neue', Helvetica, sans-serif; line-height: 1.4; }
-#header { padding: 0 18px 0 25px; }
+// #header renamed to #bromley-header
+#bromley-header { padding: 0 18px 0 25px; }
.header-nav {float:right; background:url('http://www.bromley.gov.uk/site/styles/css_img/header-nav.gif') no-repeat; overflow:hidden; width:651px; height:34px; line-height:34px; padding:0 20px;}
.header-nav li {float:left; width:130px; text-align:center; background:url('http://www.bromley.gov.uk/site/styles/css_img/header-nav-divider.gif') top right no-repeat;}
@@ -32,8 +40,8 @@ body { color: #333; font-family: Arial, 'Helvetica Neue', Helvetica, sans-serif;
#search input { background: #ececec; border: 1px solid #768b9a; border-color: #768b9a #d1dee8 #d1dee8 #768b9a; line-height: 9px; padding: 6px 5px 4px; width: 184px; }
#search input.button { background: #fff; border: 1px solid #8596a8; color: #333; font-family: 'Gill Sans', 'Trebuchet MS', Calibri, sans-serif; font-size:133%; height: 27px; line-height: 27px; padding: 0; vertical-align: top; width: 70px; }
-/* ############################################################## */
-#bromley-footer { background: #666 url('http://www.bromley.gov.uk/site/styles/css_img/footer.gif') top center no-repeat; clear: both; padding:30px 15px 50px; margin-left:-15px; color:#fff; font-size:92%;}
+// #footer renamed to #bromley-footer, image removed from background, width removed for no scrollbar, fixed font size.
+#bromley-footer { background: #666; clear: both; padding:15px 15px 50px; margin-left:-15px; color:#fff; font-size:11px;}
#bromley-footer a:link,
#bromley-footer a:visited { color: #fff; text-decoration: none; }
#bromley-footer a:hover,
@@ -43,3 +51,15 @@ body { color: #333; font-family: Arial, 'Helvetica Neue', Helvetica, sans-serif;
#bromley-footer .footer-nav li { border-right:1px solid #fff; float: left; line-height: 1; padding: 0 20px; }
#bromley-footer .footer-nav li:last-child { border: none; }
+// mySociety additions
+#bromley-header { font-size: 12px; }
+.header-nav ul { margin: 0; }
+.header-nav li { list-style-type: none; }
+.main-menu ul { margin: 0; }
+.main-menu li { list-style-type: none; }
+#search input { display: inline; margin: 0; @include border-radius(0em); }
+#search input.button { font-weight: normal; text-transform: none; }
+#bromley-footer { margin: 1em 0 0; }
+#bromley-footer .footer-nav li { list-style-type: none; }
+#bromley-footer p { margin: 0; }
+
diff --git a/web/cobrands/bromley/layout.scss b/web/cobrands/bromley/layout.scss
index 278e80176..9d9679aee 100644
--- a/web/cobrands/bromley/layout.scss
+++ b/web/cobrands/bromley/layout.scss
@@ -7,10 +7,30 @@ body {
#front-main {
background: $primary;
-
// layout sets this because base has it slightly lighter
h2 {
color: $primary_text;
}
}
+// Don't want FixMyStreet logo on desktop, and we have a skip to content in
+// Bromley header
+#site-header {
+ display: none;
+}
+
+// Currently hiding, but do want some internal navigation somewhere at the end
+.nav-wrapper {
+ display: none;
+}
+
+// Bit of extra spacing needed under Bromley header
+body.frontpage .table-cell .content {
+ margin-top: 15em;
+}
+
+// White background, so no shadow needed (unless map goes full screen, so
+// JavaScript should put it in at that point? Or just put it on all map pages?
+.content {
+ @include box-shadow(none);
+}
diff --git a/web/cobrands/fixmystreet/_layout.scss b/web/cobrands/fixmystreet/_layout.scss
index 8a284656c..37aab4653 100644
--- a/web/cobrands/fixmystreet/_layout.scss
+++ b/web/cobrands/fixmystreet/_layout.scss
@@ -920,6 +920,7 @@ body.frontpage {
border-right:1em solid #fff;
#front_stats {
background:none;
+ color: #222;
border-top:0.25em solid $primary;
padding-top:1em;
div {
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-15 13:31:09 +0000