diff options
| -rw-r--r-- | web/cobrands/fixmystreet/fixmystreet.js | 6 | ||||
| -rw-r--r-- | web/js/map-OpenLayers.js | 10 |
2 files changed, 7 insertions, 9 deletions
diff --git a/web/cobrands/fixmystreet/fixmystreet.js b/web/cobrands/fixmystreet/fixmystreet.js index bf25d2f89..d1c825a2b 100644 --- a/web/cobrands/fixmystreet/fixmystreet.js +++ b/web/cobrands/fixmystreet/fixmystreet.js @@ -92,9 +92,6 @@ $(function(){ height: 'auto', margin: 0 }); - $('#side-form').css({ - paddingTop: $(window).height() - }); $('.big-green-banner') .addClass('mobile-map-banner') .removeClass('.big-green-banner') @@ -275,9 +272,6 @@ $(function(){ }else{ //if not, move them and show, hiding .content $('.content').after('<div class="content rap-notes"></div>').hide(); - $('.rap-notes').css({ - paddingTop: $(window).height() - }); $('#report-a-problem-sidebar').appendTo('.rap-notes').show().after('<a href="#" class="rap-notes-close button-left">Back</a>'); } $('html, body').scrollTop($('#report-a-problem-sidebar').offset().top); diff --git a/web/js/map-OpenLayers.js b/web/js/map-OpenLayers.js index 7789159c1..92ced9981 100644 --- a/web/js/map-OpenLayers.js +++ b/web/js/map-OpenLayers.js @@ -463,13 +463,18 @@ OpenLayers.Control.Click = OpenLayers.Class(OpenLayers.Control, { } if ($('html').hasClass('mobile')) { + var $map_box = $('#map_box'), + width = $map_box.width(), + height = $map_box.height(); $('#sub_map_links').hide(); - $('#map_box').append( + $map_box.append( '<p id="mob_sub_map_links">' + '<a href="#" id="try_again">Try again</a>' + '<a href="#ok" id="mob_ok">OK</a>' + '</p>' - ); + ).css({ position: 'relative', width: width, height: height }); + // Making it relative here makes it much easier to do the scrolling later + $('.mobile-map-banner').text('Right place?'); // mobile user clicks 'ok' on map @@ -481,7 +486,6 @@ OpenLayers.Control.Click = OpenLayers.Class(OpenLayers.Control, { if($(this).parent().hasClass('map_complete')){ $('html, body').animate({scrollTop:0}, 1000); }else{ - var height = $('#map_box').height(); $('html, body').animate({scrollTop:height-60}, 1000, function(){ //add this class so we can modify the look of the links inside $('#mob_sub_map_links').addClass('map_complete'); |