diff options
| -rw-r--r-- | templates/web/bromley/footer.html | 1 | ||||
| -rw-r--r-- | templates/web/bromley/header.html | 5 | ||||
| -rw-r--r-- | templates/web/bromley/index.html | 16 | ||||
| -rw-r--r-- | templates/web/bromley/report/new/fill_in_details_form.html | 2 | ||||
| -rw-r--r-- | web/cobrands/bromley/base.scss | 6 | ||||
| -rw-r--r-- | web/cobrands/bromley/bromley.scss | 6 | ||||
| -rw-r--r-- | web/cobrands/bromley/layout.scss | 14 |
7 files changed, 27 insertions, 23 deletions
diff --git a/templates/web/bromley/footer.html b/templates/web/bromley/footer.html index 4ef3011a9..db77b8a29 100644 --- a/templates/web/bromley/footer.html +++ b/templates/web/bromley/footer.html @@ -40,5 +40,6 @@ </div> + </div> </body> </html> diff --git a/templates/web/bromley/header.html b/templates/web/bromley/header.html index 292401632..1e047c187 100644 --- a/templates/web/bromley/header.html +++ b/templates/web/bromley/header.html @@ -26,6 +26,7 @@ </head> <body class="[% bodyclass | html IF bodyclass %]"> + <div id="bromley-wrapper"> <div id="bromley-header" class="desk-only"> <ul class="header-nav"> @@ -84,9 +85,9 @@ [% END %] </div> - [% pre_container_extra %] + <h1 class="main desk-only">Reporting a problem in Bromley’s streets or parks</h1> <div class="container"> <div class="content[% " $mainclass" | html IF mainclass %]" role="main"> - <!-- [% INCLUDE 'debug_header.html' %] --> + diff --git a/templates/web/bromley/index.html b/templates/web/bromley/index.html index 80217d1f9..2f6a1b5bd 100644 --- a/templates/web/bromley/index.html +++ b/templates/web/bromley/index.html @@ -18,14 +18,14 @@ Modernizr.load({ [% INCLUDE 'header.html', title => '' , bodyclass => 'frontpage fullwidthpage' %] +<h1 class="main mob-only">Reporting a problem in Bromley’s streets or parks</h1> + [% IF error %] <p class="error">[% error %]</p> [% END %] <div id="front-main"> <div id="front-main-container"> - <h1>Reporting a problem in Bromley’s streets or parks</h1> - [% question = c.cobrand.enter_postcode_text() @@ -40,15 +40,15 @@ Modernizr.load({ </div> </form> - <p>This is primarily for reporting physical problems that can be fixed - like graffiti, fly tipping, or broken paving slabs to report other - kinds of problems like missed bins use our - <a href="http://www.bromley.gov.uk/report">online report it forms</a>. - </p> - </div> </div> +<p>This is primarily for reporting physical problems that can be fixed +like graffiti, fly tipping, or broken paving slabs to report other +kinds of problems like missed bins use our +<a href="http://www.bromley.gov.uk/report">online report it forms</a>. +</p> + <div class="tablewrapper"> <div id="front-howto"> <h2>[% loc('How to report a problem') %]</h2> diff --git a/templates/web/bromley/report/new/fill_in_details_form.html b/templates/web/bromley/report/new/fill_in_details_form.html index 5729f1637..d736057bd 100644 --- a/templates/web/bromley/report/new/fill_in_details_form.html +++ b/templates/web/bromley/report/new/fill_in_details_form.html @@ -1,6 +1,4 @@ <div id="report-a-problem-main"> - <h1>[% loc('Reporting a problem') %]</h1> - [% IF js %] <p id="councils_text"> [% diff --git a/web/cobrands/bromley/base.scss b/web/cobrands/bromley/base.scss index 36815e6e5..e3bc0007d 100644 --- a/web/cobrands/bromley/base.scss +++ b/web/cobrands/bromley/base.scss @@ -5,6 +5,12 @@ @import "../fixmystreet/_base"; +h1.main { + color: $primary; + text-align: center; + margin: 0.5em 0; +} + // Want a white header, and logo is slightly bigger #site-header { @include background(linear-gradient(#ddd, #fff 10%, #fff)); diff --git a/web/cobrands/bromley/bromley.scss b/web/cobrands/bromley/bromley.scss index 89ab08fd1..3522229dc 100644 --- a/web/cobrands/bromley/bromley.scss +++ b/web/cobrands/bromley/bromley.scss @@ -40,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; } -// #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;} +// #footer renamed to #bromley-footer, fixed font size. +#bromley-footer { background: #666 url('http://www.bromley.gov.uk/site/styles/css_img/footer.gif') top center no-repeat; clear: both; width:100%; padding:30px 15px 50px; margin-left:-15px; color:#fff; font-size:92%;} #bromley-footer a:link, #bromley-footer a:visited { color: #fff; text-decoration: none; } #bromley-footer a:hover, @@ -75,7 +75,7 @@ body { color: #333; font-family: Arial, 'Helvetica Neue', Helvetica, sans-serif; .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: 2em 0 0; } +#bromley-footer { padding-bottom: 60px; } #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 e74aab1a3..0d20888fc 100644 --- a/web/cobrands/bromley/layout.scss +++ b/web/cobrands/bromley/layout.scss @@ -1,6 +1,10 @@ @import "_colours"; @import "../fixmystreet/_layout"; +body { background: #9b9b9b url('http://www.bromley.gov.uk/site/styles/css_img/repeater.gif') repeat-x; } +#bromley-wrapper { background: #fff url('http://www.bromley.gov.uk/site/styles/css_img/header-corners.gif') center 110px no-repeat; margin: 1px auto 0; padding: 0 15px; width: 955px;} +.offline #bromley-wrapper { padding: 0 15px 20px; } + // So that map appears underneath the header .wrapper { position: relative; @@ -11,23 +15,17 @@ } } -body { - background: #fff; -} - #front-main { background: $primary; @include border-radius(1em 1em 0 0); + margin-bottom: 1em; + padding-top: 0; // layout sets this because base has it slightly lighter h2 { color: $primary_text; } } -.tablewrapper { - padding-top: 1em; -} - // Don't want gap that normal site has body.frontpage { .table-cell { |