aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--templates/web/bromley/header.html2
-rw-r--r--templates/web/bromley/index.html15
-rw-r--r--templates/web/fixmystreet/header.html2
-rw-r--r--templates/web/fixmystreet/index.html15
-rw-r--r--web/cobrands/bromley/layout.scss35
-rw-r--r--web/cobrands/fixmystreet/_base.scss7
-rw-r--r--web/cobrands/fixmystreet/_layout.scss34
-rw-r--r--web/cobrands/fixmystreet/fixmystreet.js8
8 files changed, 49 insertions, 69 deletions
diff --git a/templates/web/bromley/header.html b/templates/web/bromley/header.html
index 055bcf6a4..5add3c006 100644
--- a/templates/web/bromley/header.html
+++ b/templates/web/bromley/header.html
@@ -82,6 +82,8 @@
[% END %]
</div>
+ [% pre_container_extra %]
+
<div class="container">
<div class="content[% " $mainclass" | html IF mainclass %]" role="main">
diff --git a/templates/web/bromley/index.html b/templates/web/bromley/index.html
index 51ec5619a..d015b7a7a 100644
--- a/templates/web/bromley/index.html
+++ b/templates/web/bromley/index.html
@@ -16,13 +16,7 @@ Modernizr.load({
</script>
[% END %]
-[% INCLUDE 'header.html', title => '' , bodyclass => 'frontpage fullwidthpage' %]
-
-[% IF error %]
- <p class="error">[% error %]</p>
-[% END %]
-
-
+[% pre_container_extra = BLOCK %]
<div id="front-main">
<div id="front-main-container">
<h1>Reporting a problem in Bromley&rsquo;s streets or parks</h1>
@@ -49,6 +43,13 @@ Modernizr.load({
</div>
</div>
+[% END %]
+
+[% INCLUDE 'header.html', title => '' , bodyclass => 'frontpage fullwidthpage' %]
+
+[% IF error %]
+ <p class="error">[% error %]</p>
+[% END %]
<div class="tablewrapper">
<div id="front-howto">
diff --git a/templates/web/fixmystreet/header.html b/templates/web/fixmystreet/header.html
index da5a0808f..3ae3da6cb 100644
--- a/templates/web/fixmystreet/header.html
+++ b/templates/web/fixmystreet/header.html
@@ -51,6 +51,8 @@
[% END %]
</div>
+ [% pre_container_extra %]
+
<div class="container">
<div class="content[% " $mainclass" | html IF mainclass %]" role="main">
diff --git a/templates/web/fixmystreet/index.html b/templates/web/fixmystreet/index.html
index 04b23ca7f..998a88469 100644
--- a/templates/web/fixmystreet/index.html
+++ b/templates/web/fixmystreet/index.html
@@ -16,13 +16,7 @@ Modernizr.load({
</script>
[% END %]
-[% INCLUDE 'header.html', title => '' , bodyclass => 'frontpage fullwidthpage' %]
-
-[% IF error %]
- <p class="error">[% error %]</p>
-[% END %]
-
-
+[% pre_container_extra = BLOCK %]
<div id="front-main">
<div id="front-main-container">
<h1>[% loc('Report, view, or discuss local problems') %]</h1>
@@ -44,6 +38,13 @@ Modernizr.load({
</form>
</div>
</div>
+[% END %]
+
+[% INCLUDE 'header.html', title = '', bodyclass = 'frontpage fullwidthpage' %]
+
+[% IF error %]
+ <p class="error">[% error %]</p>
+[% END %]
<div class="tablewrapper">
<div id="front-howto">
diff --git a/web/cobrands/bromley/layout.scss b/web/cobrands/bromley/layout.scss
index ec3b45201..6572a6f10 100644
--- a/web/cobrands/bromley/layout.scss
+++ b/web/cobrands/bromley/layout.scss
@@ -5,6 +5,11 @@
.wrapper {
position: relative;
}
+.ie6, .ie7 {
+ .wrapper {
+ padding-top: 1em;
+ }
+}
body {
background: #fff;
@@ -18,6 +23,15 @@ body {
}
}
+// Don't want gap that normal site has
+body.frontpage {
+ .table-cell {
+ .content {
+ margin-top: 0;
+ }
+ }
+}
+
// Don't want FixMyStreet logo on desktop, and we have a skip to content in
// Bromley header
#site-header {
@@ -29,27 +43,6 @@ body {
display: none;
}
-// Bit of extra spacing needed under Bromley header
-#front-main {
- top: -16em;
-}
-body.frontpage .table-cell .content {
- margin-top: 16em;
-}
-.ie6 {
- #front-main {
- left: 1.5em;
- }
-}
-.ie6, .ie7 {
- #front-main {
- top: -3em;
- }
- body.frontpage .table-cell .content {
- margin-top: 12em;
- }
-}
-
// White background, so no shadow needed.
.content {
@include box-shadow(none);
diff --git a/web/cobrands/fixmystreet/_base.scss b/web/cobrands/fixmystreet/_base.scss
index 66ce2d96b..9d09d5c69 100644
--- a/web/cobrands/fixmystreet/_base.scss
+++ b/web/cobrands/fixmystreet/_base.scss
@@ -31,9 +31,6 @@ h1 {
margin-top: 0.5em;
margin-bottom: 0.5em;
}
-#front-main h1 {
- margin-top: 0.7em;
-}
h1#reports_heading span {
display: none;
}
@@ -1362,6 +1359,7 @@ table.nicetable {
/* Front page */
#front-main {
text-align:center;
+ margin: 1em;
h2 {
font: {
style:italic;
@@ -1370,6 +1368,9 @@ table.nicetable {
}
color:#4d4d4d;
}
+ p {
+ margin: 0.5em 0 0;
+ }
#postcodeForm {
@extend .full-width;
padding:1em;
diff --git a/web/cobrands/fixmystreet/_layout.scss b/web/cobrands/fixmystreet/_layout.scss
index 3c762ad2d..838d2c06e 100644
--- a/web/cobrands/fixmystreet/_layout.scss
+++ b/web/cobrands/fixmystreet/_layout.scss
@@ -783,19 +783,15 @@ textarea.form-error {
body.frontpage {
.table-cell {
- // we do this so we can have full screen width elements
- >.container {
- width:100%;
- }
.content {
- margin:14em auto 0 auto;
+ margin: 1em auto 0;
}
}
.nav-wrapper-2{
height:6em;
}
#site-header{
- height:9em;
+ height:8em;
}
#site-logo{
top:3em;
@@ -834,7 +830,7 @@ body.frontpage {
.ie6, .ie7 {
body.frontpage {
#site-header {
- height:3em;
+ height:4em;
}
#site-logo {
top:-1em;
@@ -847,24 +843,13 @@ body.frontpage {
.ie6 body.frontpage #site-logo {
background:url(/cobrands/fixmystreet/images/ie_front_logo.gif) 0 0 no-repeat;
}
-//weird margining thing for ie8
-.ie8 body.frontpage {
- #front-main {
- top:-12em;
- }
- .table-cell .content {
- margin-top:12em;
- }
-}
// big yellow bit full screen width
#front-main {
color: $primary_text;
background: $primary url(/cobrands/fixmystreet/images/tile-y.jpg);
- position:absolute;
- width:100%;
- left:0;
- top:-15em;
+ margin: 0;
+ padding: 1em;
#front-main-container {
max-width: 57em;
margin:0 auto;
@@ -877,6 +862,7 @@ body.frontpage {
#postcodeForm {
background:none;
overflow:hidden;
+ padding-bottom: 0;
margin-right:0.5em;
label {
margin:0.5em 0;
@@ -912,20 +898,14 @@ body.frontpage {
a#geolocate_link {
background:none;
color:#222;
- margin:-1em 0 0.5em 0;
text-decoration: none;
+ padding-bottom: 0;
&:hover {
text-decoration:underline;
background:none;
}
}
}
-.ie6, .ie7 {
- #front-main {
- top:2em;
- }
-}
-
#front-howto {
border-right:1em solid #fff;
diff --git a/web/cobrands/fixmystreet/fixmystreet.js b/web/cobrands/fixmystreet/fixmystreet.js
index ba1370417..55b2cd3e3 100644
--- a/web/cobrands/fixmystreet/fixmystreet.js
+++ b/web/cobrands/fixmystreet/fixmystreet.js
@@ -108,7 +108,7 @@ $(function(){
if ($html.hasClass('ie6')) {
$('#map_box').prependTo('.wrapper').css({
zIndex: 0, position: 'absolute',
- right: 0, top: '4em',
+ right: 0, top: '1em',
width: $window.width() - o.left - $content.outerWidth(),
height: $window.height() - o.top + 32,
margin: 0
@@ -138,10 +138,10 @@ $(function(){
margin: 0
});
}
- if (cobrand == 'bromley') {
- $('#bromley-footer').hide();
- }
if (typeof fixmystreet !== 'undefined') {
+ if (cobrand == 'bromley') {
+ $('#bromley-footer').hide();
+ }
fixmystreet.state_map = 'full';
}
if (typeof fixmystreet !== 'undefined' && fixmystreet.page == 'around') {
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-13 01:47:14 +0000