Merge branch 'master' of linz:/srv/git/git-kairo

diff --git a/js/map.js b/js/map.js
index 5cd194e59268d17dda3175e399cdc55e97efa7fc..f27b0191c51efa38c6108e7cae000a3d56d22a75 100644 (file)
--- a/js/map.js
+++ b/js/map.js
@@ -124,6 +124,7 @@ function initMap() {
   gCanvas.addEventListener("touchcancel", mapEvHandler, false);
   gCanvas.addEventListener("touchleave", mapEvHandler, false);
 
+  // XXX deprecated? see https://groups.google.com/forum/?fromgroups#!topic/mozilla.dev.planning/kuhrORubaRY[1-25]
   gCanvas.addEventListener("DOMMouseScroll", mapEvHandler, false);
   gCanvas.addEventListener("mousewheel", mapEvHandler, false);
 
@@ -183,6 +184,8 @@ function setMapStyle() {
   if (mapSel.selectedIndex >= 0 && gActiveMap != mapSel.value) {
     gActiveMap = mapSel.value;
     gTiles = {};
+    document.getElementById("copyright").innerHTML =
+        gMapStyles[gActiveMap].copyright;
     drawMap();
   }
 }

diff --git a/style/lantea.css b/style/lantea.css
index 0fbaddb369a1baad329dacb2ec5fa95d69b1b132..aa33469a67c01e34a6e85b184552f01a802656c5 100644 (file)
--- a/style/lantea.css
+++ b/style/lantea.css
@@ -86,3 +86,19 @@ h1 {
   border-radius: 3px;
   padding: 0 3px;
 }
+
+
+@media screen and (max-width: 500px) {
+  body {
+    font-size: 10px;
+  }
+  #overlayArea {
+    top: 1px;
+    left: 1px;
+  }
+  #copyright {
+    bottom: 1px;
+    right: 1px;
+    font-size: 8px;
+  }
+}