diff options
Diffstat (limited to 'web')
-rw-r--r-- | web/css/core.css | 17 | ||||
-rw-r--r-- | web/css/core.scss | 16 | ||||
-rw-r--r-- | web/js/map-OpenLayers.js | 6 | ||||
-rw-r--r-- | web/js/map-bing-ol.js | 1 |
4 files changed, 34 insertions, 6 deletions
diff --git a/web/css/core.css b/web/css/core.css index 39f448b8c..937bf533d 100644 --- a/web/css/core.css +++ b/web/css/core.css @@ -113,7 +113,22 @@ background-color: #ccffcc; border: solid 2px #009900; padding: 5px; - text-align: center; } + text-align: center; +} +#mysociety #form_sign_in_yes { + float: left; + width: 47%; + padding-right: 1%; + border-right: solid 1px #999999; + margin-bottom: 1em; +} +#mysociety #form_sign_in_no, #mysociety #fieldset #form_sign_in_no { + float: right; + width: 47%; + padding-left: 1%; + clear: none; + margin-bottom: 1em; +} #mysociety #watermark { background: url("/i/mojwatermark6.png"); height: 113px; diff --git a/web/css/core.scss b/web/css/core.scss index 1c9d5f451..cbf15f16b 100644 --- a/web/css/core.scss +++ b/web/css/core.scss @@ -189,6 +189,22 @@ $map_width: 500px; text-align: center; } + #form_sign_in_yes { + float: left; + width: 47%; + padding-right: 1%; + border-right: solid 1px #999999; + margin-bottom: 1em; + } + + #form_sign_in_no, #fieldset #form_sign_in_no { + float: right; + width: 47%; + padding-left: 1%; + clear: none; + margin-bottom: 1em; + } + // Map #watermark { diff --git a/web/js/map-OpenLayers.js b/web/js/map-OpenLayers.js index 22492e400..83e535f1c 100644 --- a/web/js/map-OpenLayers.js +++ b/web/js/map-OpenLayers.js @@ -1,7 +1,5 @@ YAHOO.util.Event.onContentReady('map', function() { - fixmystreet.ZOOM_OFFSET = 13; - var perm = new OpenLayers.Control.Permalink(); set_map_config(perm); @@ -11,9 +9,9 @@ YAHOO.util.Event.onContentReady('map', function() { }); fixmystreet.layer_options = OpenLayers.Util.extend({ - zoomOffset: fixmystreet.ZOOM_OFFSET, + zoomOffset: fixmystreet.zoomOffset, transitionEffect: 'resize', - numZoomLevels: 5 + numZoomLevels: fixmystreet.numZoomLevels }, fixmystreet.layer_options); var layer = new fixmystreet.map_type("", fixmystreet.layer_options); fixmystreet.map.addLayer(layer); diff --git a/web/js/map-bing-ol.js b/web/js/map-bing-ol.js index 00c3a487f..c3c3b994e 100644 --- a/web/js/map-bing-ol.js +++ b/web/js/map-bing-ol.js @@ -1,5 +1,4 @@ function set_map_config(perm) { - fixmystreet.ZOOM_OFFSET = 13; fixmystreet.controls = [ new OpenLayers.Control.ArgParser(), new OpenLayers.Control.Navigation(), |