Map updates for Bromley. Might need more work.

2 files changed, 37 insertions, 24 deletions

diff --git a/web/cobrands/bromley/layout.scss b/web/cobrands/bromley/layout.scss
index 0d20888fc..183f17722 100644
--- a/web/cobrands/bromley/layout.scss
+++ b/web/cobrands/bromley/layout.scss
@@ -60,7 +60,7 @@ body.frontpage {
 
 // White background, so no shadow needed.
 .content {
-    margin-top: 1em;
+    margin-top: 0;
     @include box-shadow(none);
 }
 .ie6, .ie7, .ie8  {
@@ -68,26 +68,37 @@ body.frontpage {
         border: none;
     }
 }
-// Except on map pages
-body.mappage .content {
-    @include box-shadow(0px 0px 6px 1px #000);
-}
-.ie6, .ie7, .ie8  {
-    body.mappage .content {
-        border: solid 1px #666;
-    }
-}
 
 // As map can scroll and isn't at the top, give it an edge
 #map_box {
-    border-top: solid 1px #999;
-    border-bottom: solid 1px #999;
+    border: solid 1px #999;
+    top: 1em;
+    margin: 0;
 }
 
 // Perhaps fix map location (should be in central?)
 .ie6 #map_box, .ie7 #map_box {
-    right: -30em;
-    top: 0;
+    right: -32em;
+}
+
+.general-sidebar-notes,
+#report-a-problem-sidebar {
+  position: static;
+  width: auto;
+  @include box-shadow(rgba(0, 0, 0, 0), 0, 0, 0);
+  .sidebar-tips,
+  .sidebar-notes {
+    font-size:1em;
+  }
+}
+
+.ie7 .big-green-banner {
+    right: 0;
+}
+
+// Pull OpenLayers navigation down a bit
+#fms_pan_zoom {
+    top: 0.5em !important;
 }
 
 // Fix location of aside sidebar
diff --git a/web/cobrands/fixmystreet/fixmystreet.js b/web/cobrands/fixmystreet/fixmystreet.js
index bc0ff1856..cce66803c 100644
--- a/web/cobrands/fixmystreet/fixmystreet.js
+++ b/web/cobrands/fixmystreet/fixmystreet.js
@@ -104,16 +104,17 @@ $(function(){
             // Make map full screen on non-mobile sizes.
             $html.removeClass('mobile');
             if (cobrand == 'bromley') {
-                var $window = $(window), $content = $('.content'), o = $content.offset();
-                var map_height = $window.height() - o.top;
-                if ($html.hasClass('ie6')) {
-                    map_height = $window.height() - o.top + 32;
+                var bromley_right;
+                if ($html.hasClass('ie6') || $html.hasClass('ie7')) {
+                    bromley_right = '-32em';
+                } else {
+                    bromley_right = '0em';
                 }
-                $('#map_box').prependTo('.wrapper').css({
-                    zIndex: 0, position: 'absolute',
-                    right: 0, top: '1em',
-                    width: $window.width() - o.left - $content.outerWidth(),
-                    height: map_height,
+                // Do the same as CSS (in case resized from mobile).
+                $('#map_box').prependTo('.content').css({
+                    zIndex: 1, position: 'absolute',
+                    top: '1em', left: '', right: bromley_right, bottom: '',
+                    width: '29em', height: '29em',
                     margin: 0
                 });
             } else if ($html.hasClass('ie6')) {
@@ -134,8 +135,9 @@ $(function(){
             if (typeof fixmystreet !== 'undefined') {
                 if (cobrand == 'bromley') {
                     $('#bromley-footer').hide();
+                } else {
+                    fixmystreet.state_map = 'full';
                 }
-                fixmystreet.state_map = 'full';
             }
             if (typeof fixmystreet !== 'undefined' && fixmystreet.page == 'around') {
                 // Remove full-screen-ness