Merge branch 'leaflet'

[rails.git] / app / assets / stylesheets / common.css.scss

diff --git a/app/assets/stylesheets/common.css.scss b/app/assets/stylesheets/common.css.scss
index 2837270fdf654fd035841a0b6b29dc08c7cab25c..217bb0c669c341463fea61a90296d7e466bad1b6 100644 (file)
--- a/app/assets/stylesheets/common.css.scss
+++ b/app/assets/stylesheets/common.css.scss
@@ -430,7 +430,7 @@ body.site-export #tabnav a#exportanchor {
   left: 15px;
 }
 
   left: 15px;
 }
 

-/* Rules for OpenLayers maps */
+/* Rules for Leaflet maps */

 
 #map {
   margin: 0px;
 
 #map {
   margin: 0px;


@@ -438,13 +438,6 @@ body.site-export #tabnav a#exportanchor {
   padding: 0px;
 }
 
   padding: 0px;
 }
 

-.olControlAttribution {
-  bottom: 15px !important;
-  left: 0px !important;
-  right: 0px !important;
-  text-align: center;
-}
-

 #permalink {
   z-index: 10000;
   position: absolute;
 #permalink {
   z-index: 10000;
   position: absolute;


@@ -460,11 +453,13 @@ body.site-export #tabnav a#exportanchor {
   padding: 5px;
 }
 
   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;
   top: 40px !important;

+
+  .leaflet-control {
+    margin-top: 0px !important;
+  }

 }
 
 .site-index #map .olControlScaleLine,
 }
 
 .site-index #map .olControlScaleLine,


@@ -1098,16 +1093,21 @@ p#contributorGuidance {
 
 /* Rules for the user map */
 
 
 /* Rules for the user map */
 

-.user_map .olControlSimplePanZoom {
+.user_map .leaflet-control-pan,
+.user_map .leaflet-control-zoomslider {

   display: none;
 }
 
   display: none;
 }
 

-.user_map .olControlZoom {
+.user_map .leaflet-control-zoom {

   display: block;
 }
 
 /* Rules for user popups on maps */
 
   display: block;
 }
 
 /* Rules for user popups on maps */
 

+.user_popup {
+  min-width: 200px;
+}
+

 .user_popup p {
   padding-top: 3px;
   padding-bottom: 3px;
 .user_popup p {
   padding-top: 3px;
   padding-bottom: 3px;