aboutsummaryrefslogtreecommitdiffstats
path: root/web
diff options
context:
space:
mode:
authorMatthew Somerville <matthew-github@dracos.co.uk>2016-09-07 12:55:35 +0100
committerMatthew Somerville <matthew-github@dracos.co.uk>2016-09-07 12:55:35 +0100
commit80a01c11f656f19d6df4c2e4294f613db14689b1 (patch)
treed0694e80027ed20ed623db1c0cdaf4c77f0df0d3 /web
parentf018e7969ef5d77a3b3fac780d235dfcd3301bb2 (diff)
parent0016c900b2f65f364fdfa373e8af723db5ebab75 (diff)
Merge branch jonkri:master.
Diffstat (limited to 'web')
-rw-r--r--web/cobrands/fixamingata/images/fms-og_image.jpgbin0 -> 107909 bytes
-rw-r--r--web/cobrands/fixamingata/layout.scss6
-rw-r--r--web/js/map-OpenStreetMap.js8
3 files changed, 10 insertions, 4 deletions
diff --git a/web/cobrands/fixamingata/images/fms-og_image.jpg b/web/cobrands/fixamingata/images/fms-og_image.jpg
new file mode 100644
index 000000000..896b2e87c
--- /dev/null
+++ b/web/cobrands/fixamingata/images/fms-og_image.jpg
Binary files differ
diff --git a/web/cobrands/fixamingata/layout.scss b/web/cobrands/fixamingata/layout.scss
index 2d4ab90cf..bd1cab41a 100644
--- a/web/cobrands/fixamingata/layout.scss
+++ b/web/cobrands/fixamingata/layout.scss
@@ -114,3 +114,9 @@ h3, h4,
#postcodeForm { margin-left: -1em !important; margin-right: -1em !important; }
body.fullwidthpage .container .content footer .tablewrapper { background: #fff; }
+
+body.frontpage #site-logo { top: 0em; }
+
+body.frontpage #site-header { height: 85px; }
+
+body.frontpage #user-meta { margin-top: 1.2em; } \ No newline at end of file
diff --git a/web/js/map-OpenStreetMap.js b/web/js/map-OpenStreetMap.js
index b2d6a4f8b..a742e61ba 100644
--- a/web/js/map-OpenStreetMap.js
+++ b/web/js/map-OpenStreetMap.js
@@ -63,10 +63,10 @@ OpenLayers.Layer.OSM.MapQuestOpen = OpenLayers.Class(OpenLayers.Layer.OSM, {
*/
initialize: function(name, options) {
var url = [
- "http://otile1.mqcdn.com/tiles/1.0.0/map/${z}/${x}/${y}.png",
- "http://otile2.mqcdn.com/tiles/1.0.0/map/${z}/${x}/${y}.png",
- "http://otile3.mqcdn.com/tiles/1.0.0/map/${z}/${x}/${y}.png",
- "http://otile4.mqcdn.com/tiles/1.0.0/map/${z}/${x}/${y}.png"
+ "https://otile1-s.mqcdn.com/tiles/1.0.0/map/${z}/${x}/${y}.png",
+ "https://otile2-s.mqcdn.com/tiles/1.0.0/map/${z}/${x}/${y}.png",
+ "https://otile3-s.mqcdn.com/tiles/1.0.0/map/${z}/${x}/${y}.png",
+ "https://otile4-s.mqcdn.com/tiles/1.0.0/map/${z}/${x}/${y}.png"
];
options = OpenLayers.Util.extend({
/* Below line added to OSM's file in order to allow minimum zoom level */