aboutsummaryrefslogtreecommitdiffstats
path: root/web
diff options
context:
space:
mode:
authorMatthew Somerville <matthew@mysociety.org>2014-09-24 21:33:47 +0100
committerMatthew Somerville <matthew@mysociety.org>2014-09-24 22:06:41 +0100
commita43264a12e4339c7cda589368f9b493048eaf7fd (patch)
tree4c0dbf6c2fa918a4bb346dc6eb31722bdd3eec7d /web
parent5b0500ee3a0f9660615999d568d2f7eec9cdc212 (diff)
Various fixes to cobrands post zero content margin
Diffstat (limited to 'web')
-rw-r--r--web/cobrands/barnet/layout.scss12
-rw-r--r--web/cobrands/barnet/position_map.js2
-rw-r--r--web/cobrands/fixmystreet/fixmystreet.js2
-rw-r--r--web/cobrands/oxfordshire/layout.scss5
-rw-r--r--web/cobrands/stevenage/layout.scss2
5 files changed, 9 insertions, 14 deletions
diff --git a/web/cobrands/barnet/layout.scss b/web/cobrands/barnet/layout.scss
index 4c035386c..a6332bbff 100644
--- a/web/cobrands/barnet/layout.scss
+++ b/web/cobrands/barnet/layout.scss
@@ -67,9 +67,12 @@ body.fullwidthpage {
}
}
+.content {
+ @include box-shadow(none);
+}
+
body.twothirdswidthpage {
.content {
- @include box-shadow(none);
width: 640px;
margin-top: 0;
.sticky-sidebar {
@@ -93,7 +96,6 @@ body.twothirdswidthpage {
.frontpage .content {
margin: 0;
- @include box-shadow(none);
}
.ie6, .ie7, .ie8 {
.frontpage .content {
@@ -193,10 +195,6 @@ body.frontpage {
clear: both;
}
-.container {
- padding: 0 1em;
-}
-
#site-header,
#site-logo {
display: none !important;
@@ -251,5 +249,5 @@ ol.big-numbers > li::before {
#map_box {
- border: 1px solid black;
+ border: 1px solid #999;
}
diff --git a/web/cobrands/barnet/position_map.js b/web/cobrands/barnet/position_map.js
index 465d852ec..b2b7bf05a 100644
--- a/web/cobrands/barnet/position_map.js
+++ b/web/cobrands/barnet/position_map.js
@@ -9,7 +9,7 @@ function position_map_box() {
zIndex: 0, position: map_pos,
top: 1, left: $('.wrapper').left,
right: 0, bottom: $('.wrapper').bottom + 1,
- width: '898px', height: map_height,
+ width: '896px', height: map_height,
margin: 0
});
}
diff --git a/web/cobrands/fixmystreet/fixmystreet.js b/web/cobrands/fixmystreet/fixmystreet.js
index 054bd4480..faa269a7c 100644
--- a/web/cobrands/fixmystreet/fixmystreet.js
+++ b/web/cobrands/fixmystreet/fixmystreet.js
@@ -461,6 +461,8 @@ $.fn.drawer = function(id, ajax) {
var offset = -18 * 16;
if (cobrand == 'bromley') {
offset = -110;
+ } else if (cobrand == 'oxfordshire') {
+ offset = -15 * 16;
}
if (cobrand !== "eastsussex") {
heightFix(window, '.content', offset, 1);
diff --git a/web/cobrands/oxfordshire/layout.scss b/web/cobrands/oxfordshire/layout.scss
index ff7f9b373..c48568f1f 100644
--- a/web/cobrands/oxfordshire/layout.scss
+++ b/web/cobrands/oxfordshire/layout.scss
@@ -129,11 +129,6 @@ body.mappage {
z-index: 1;
}
- .content, .ie7 .content, .ie9 .content {
- margin: 3em 0 0 1em;
- @include box-shadow(0px 0px 6px 1px #000);
- }
-
.container {
width: auto;
min-height: 635px;
diff --git a/web/cobrands/stevenage/layout.scss b/web/cobrands/stevenage/layout.scss
index 9886681bc..b6f154298 100644
--- a/web/cobrands/stevenage/layout.scss
+++ b/web/cobrands/stevenage/layout.scss
@@ -7,7 +7,7 @@
// d523b431
.nav-wrapper{
.nav-wrapper-2{
- min-height: auto;
+ min-height: 0;
// e7c122a4 / 0b0a619b / - "Removed mySociety menu and positioned menu"
top: 9.5em;
border-top: none;