diff options
| -rw-r--r-- | web/cobrands/fixmystreet/fixmystreet.js | 12 | ||||
| -rw-r--r-- | web/cobrands/fixmystreet/layout.scss | 16 | ||||
| -rw-r--r-- | web/js/map-OpenLayers.js | 3 |
3 files changed, 23 insertions, 8 deletions
diff --git a/web/cobrands/fixmystreet/fixmystreet.js b/web/cobrands/fixmystreet/fixmystreet.js index 50f67fb90..01f4b8774 100644 --- a/web/cobrands/fixmystreet/fixmystreet.js +++ b/web/cobrands/fixmystreet/fixmystreet.js @@ -76,8 +76,18 @@ function tabs(elem) $(function(){ //add mobile class if small screen - if(Modernizr.mq('only screen and (max-width:47em)')) { + if(Modernizr.mq('only screen and (max-width:48em)')) { $('html').addClass('mobile'); + } else { + + // Make map full screen on non-mobile sizes. + $('#map_box').prependTo('.wrapper').css({ + zIndex: 0, position: 'fixed', + top: 0, left: 0, right: 0, bottom: 0, + width: '100%', height: '100%', + margin: 0 + }).data('size', 'full'); + } //heightfix the desktop .content div if(Modernizr.mq('only screen and (min-width:48em)')) { diff --git a/web/cobrands/fixmystreet/layout.scss b/web/cobrands/fixmystreet/layout.scss index c4aac270e..78b26921e 100644 --- a/web/cobrands/fixmystreet/layout.scss +++ b/web/cobrands/fixmystreet/layout.scss @@ -2,6 +2,12 @@ @import "_colours"; @import "_mixins"; +// OpenLayers fix for navigation being top right +.olControlPanZoom { + right: 44px !important; + top: 4em !important; + left: auto !important; +} //hacks for desk/mob only stuff .desk-only { @@ -353,10 +359,6 @@ body.twothirdswidthpage { top: 0; z-index:1; } -#mapForm #map_box { - width: 15em; - top:2em; -} // log in bit, pokes above the .content div #user-meta{ @@ -506,7 +508,7 @@ textarea.form-error { left:29.5em; top:2em; width:15em; - z-index: -1; + //z-index: -1; @include box-shadow(rgba(0, 0, 0, 0.6) 0px 0px 4px 1px); .sidebar-tips { background:#eeeeee; @@ -531,7 +533,7 @@ textarea.form-error { position: absolute; left:29.5em; width:15em; - z-index: -1; + //z-index: -1; @include box-shadow(rgba(0, 0, 0, 0.6) 0px 0px 4px 1px); p { background:#eeeeee; @@ -793,4 +795,4 @@ body.frontpage { width: auto; } -}
\ No newline at end of file +} diff --git a/web/js/map-OpenLayers.js b/web/js/map-OpenLayers.js index 3bf2078e7..e7848c5bb 100644 --- a/web/js/map-OpenLayers.js +++ b/web/js/map-OpenLayers.js @@ -207,6 +207,9 @@ $(function(){ ); fixmystreet.map.setCenter(centre, fixmystreet.zoom || 3); } + if ($('#map_box').data('size')=='full') { + fixmystreet.map.pan(-200, -25, { animate: false }); + } if (document.getElementById('mapForm')) { var click = new OpenLayers.Control.Click(); |