diff options
| -rw-r--r-- | web/cobrands/sass/_base.scss | 66 | ||||
| -rw-r--r-- | web/cobrands/sass/_layout.scss | 12 | ||||
| -rw-r--r-- | web/cobrands/zurich/layout.scss | 4 | ||||
| -rw-r--r-- | web/js/map-OpenLayers.js | 16 |
4 files changed, 57 insertions, 41 deletions
diff --git a/web/cobrands/sass/_base.scss b/web/cobrands/sass/_base.scss index a8f6e7a96..b8eafdbe4 100644 --- a/web/cobrands/sass/_base.scss +++ b/web/cobrands/sass/_base.scss @@ -1086,8 +1086,8 @@ html.js #map .noscript { // Left and right so that zoom can be left, pan right. #fms_pan_zoom { top: 0.5em; - #{$left}: 0.5em !important; - #{$right}: 0.5em !important; + #{$left}: 0.5em; + #{$right}: 0.5em; } // The left and right of the above causes the navigation to move off-screen left in IE6. .ie6 #fms_pan_zoom { @@ -1101,55 +1101,55 @@ html.js #map .noscript { #fms_pan_zoom_panright, #fms_pan_zoom_zoomin, #fms_pan_zoom_zoomout { - width:36px !important; - height:36px !important; + width: 36px; + height: 36px; text-indent: flip(-999999px, 999999px); // text-align from OL style makes this necessary - background:url($image-sprite) no-repeat; + background: url($image-sprite) no-repeat; filter: none !important; // Override OpenLayers PNG handling of the navigation } #fms_pan_zoom_zoomworld { - display:none !important; - visibility:none !important; + display: none !important; + visibility: none !important; } #fms_pan_zoom_panup { - background-position:-42px -222px; - #{$right}: 30px !important; - #{$left}: auto !important; - top:0 !important; + background-position: -42px -222px; + #{$right}: 30px; + #{$left}: auto; + top: 0; } #fms_pan_zoom_pandown { - background-position:-42px -282px; - #{$right}: 30px !important; - #{$left}: auto !important; - top:72px !important; + background-position: -42px -282px; + #{$right}: 30px; + #{$left}: auto; + top: 72px; } #fms_pan_zoom_panleft { - background-position:-12px -252px; - width:48px !important; - #{$right}: flip(48px, 0) !important; - #{$left}: auto !important; - top:36px !important; + background-position: -12px -252px; + width: 48px; + #{$right}: flip(48px, 0); + #{$left}: auto; + top: 36px; } #fms_pan_zoom_panright { - background-position:-60px -252px; - width:48px !important; - #{$right}: flip(0, 48px) !important; - #{$left}: auto !important; - top:36px !important; + background-position: -60px -252px; + width: 48px; + #{$right}: flip(0, 48px); + #{$left}: auto; + top: 36px; } #fms_pan_zoom_zoomin { - background-position:-152px -223px; - height:44px !important; - #{$left}: 0 !important; - top:0 !important; + background-position: -152px -223px; + height: 44px; + #{$left}: 0; + top: 0; } #fms_pan_zoom_zoomout { - background-position:-152px -259px; - height:44px !important; - #{$left}: 0 !important; - top:44px !important; + background-position: -152px -259px; + height: 44px; + #{$left}: 0; + top: 44px; } //hide pins, show old reports etc diff --git a/web/cobrands/sass/_layout.scss b/web/cobrands/sass/_layout.scss index 2f601775b..cdb15e691 100644 --- a/web/cobrands/sass/_layout.scss +++ b/web/cobrands/sass/_layout.scss @@ -624,14 +624,14 @@ body.authpage { // push zoom back over to right #fms_pan_zoom_zoomin { - #{$left}: auto !important; - #{$right}: 30px !important; - top:130px !important; + #{$left}: auto; + #{$right}: 30px; + top: 130px; } #fms_pan_zoom_zoomout { - #{$left}: auto !important; - #{$right}: 30px !important; - top:174px !important; + #{$left}: auto; + #{$right}: 30px; + top: 174px; } .olControlAttribution { diff --git a/web/cobrands/zurich/layout.scss b/web/cobrands/zurich/layout.scss index 3a20d05c5..a23d8a9ae 100644 --- a/web/cobrands/zurich/layout.scss +++ b/web/cobrands/zurich/layout.scss @@ -227,10 +227,10 @@ body.twothirdswidthpage { top: 9em !important; } #fms_pan_zoom_zoomin { - top: 0 !important; + top: 0; } #fms_pan_zoom_zoomout { - top: 44px !important; + top: 44px; } // Admin specific changes diff --git a/web/js/map-OpenLayers.js b/web/js/map-OpenLayers.js index 267643898..bef9bd58f 100644 --- a/web/js/map-OpenLayers.js +++ b/web/js/map-OpenLayers.js @@ -547,6 +547,22 @@ OpenLayers.Control.PanZoomFMS = OpenLayers.Class(OpenLayers.Control.PanZoom, { break; } } + }, + moveTo: function(){}, + draw: function(px) { + // A customised version of .draw() that doesn't specify + // and dimensions/positions for the buttons, since we + // size and position them all using CSS. + OpenLayers.Control.prototype.draw.apply(this, arguments); + this.buttons = []; + this._addButton("panup", "north-mini.png"); + this._addButton("panleft", "west-mini.png"); + this._addButton("panright", "east-mini.png"); + this._addButton("pandown", "south-mini.png"); + this._addButton("zoomin", "zoom-plus-mini.png"); + this._addButton("zoomworld", "zoom-world-mini.png"); + this._addButton("zoomout", "zoom-minus-mini.png"); + return this.div; } }); |