From: Tom Hughes <tom@compton.nu>
Date: Fri, 23 Nov 2012 10:41:45 +0000 (+0000)
Subject: Merge branch 'leaflet'
X-Git-Tag: live~5804
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/7d92ec704786c2d887e1946f25746d6d70ee7ea8

Merge branch 'leaflet'
---

7d92ec704786c2d887e1946f25746d6d70ee7ea8
diff --cc app/assets/stylesheets/common.css.scss
index 2837270fd,606cdd47d..217bb0c66
--- a/app/assets/stylesheets/common.css.scss
+++ b/app/assets/stylesheets/common.css.scss
@@@ -427,10 -413,9 +427,10 @@@ body.site-export #tabnav a#exportancho
    z-index: 20000000;
    position: absolute;
    top: 15px;
 +  left: 15px;
  }
  
- /* Rules for OpenLayers maps */
+ /* Rules for Leaflet maps */
  
  #map {
    margin: 0px;
@@@ -460,18 -438,15 +453,20 @@@
    padding: 5px;
  }
  
- .site-index #map .SimpleLayerSwitcher,
- .site-index #map .olControlSimplePanZoom,
- .site-export #map .SimpleLayerSwitcher,
- .site-export #map .olControlSimplePanZoom {
+ .site-index .leaflet-top,
+ .site-export .leaflet-top {
    top: 40px !important;
+ 
+   .leaflet-control {
+     margin-top: 0px !important;
+   }
  }
  
 +.site-index #map .olControlScaleLine,
 +.site-export #map .olControlScaleLine {
 +  left: 10px !important;
 +}
 +
  /* Rules for edit menu */
  
  .menuicon {