properly positioned leaflet controls and removed old open layers style rules.

diff --git a/app/assets/stylesheets/common.css.scss b/app/assets/stylesheets/common.css.scss
index ecdb40b44854783e7d69edda16d9695904fd335c..2723678e4f7f5b568faf483742d9a76893552f3c 100644 (file)
--- a/app/assets/stylesheets/common.css.scss
+++ b/app/assets/stylesheets/common.css.scss
@@ -415,7 +415,7 @@ body.site-export #tabnav a#exportanchor {
   top: 15px;
 }
 
   top: 15px;
 }
 

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

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


@@ -423,13 +423,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;


@@ -445,11 +438,9 @@ 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 {
-  top: 40px !important;
+.site-index .leaflet-top .leaflet-control,
+.site-export .leaflet-top .leaflet-control {
+  margin-top: 40px !important;

 }
 
 /* Rules for edit menu */
 }
 
 /* Rules for edit menu */


@@ -1014,14 +1005,6 @@ p#contributorGuidance {
 
 /* Rules for the user map */
 
 
 /* Rules for the user map */
 

-.user_map .olControlSimplePanZoom {
-  display: none;
-}
-
-.user_map .olControlZoom {
-  display: block;
-}
-

 /* Rules for user popups on maps */
 
 .user_popup p {
 /* Rules for user popups on maps */
 
 .user_popup p {

diff --git a/app/assets/stylesheets/large.css b/app/assets/stylesheets/large.css
index ca58badc4097e70c98bd0a854377025756070b29..a24a55813df8384d28728a5813016ff3f484e95c 100644 (file)
--- a/app/assets/stylesheets/large.css
+++ b/app/assets/stylesheets/large.css
@@ -5,9 +5,3 @@
 #small-greeting {
   display: none;
 }
 #small-greeting {
   display: none;
 }

-
-/* Rules for OpenLayers maps */
-
-.olControlZoom {
-  display: none;
-}

diff --git a/app/assets/stylesheets/small.css.scss b/app/assets/stylesheets/small.css.scss
index 84813e9c1a2715cacdf4a20e0dac64ec082220ae..19b4e6b89110b66a16f545574d1eeaa9bf3a5cd8 100644 (file)
--- a/app/assets/stylesheets/small.css.scss
+++ b/app/assets/stylesheets/small.css.scss
@@ -92,15 +92,9 @@ h1 {
   border: 0;
 }
 
   border: 0;
 }
 

-.olControlSimplePanZoom {
-  display: none;
-}
-
-.site-index #map .olControlZoom,
-.site-index #map .SimpleLayerSwitcher,
-.site-export #map .olControlZoom,
-.site-export #map .SimpleLayerSwitcher {
-  top: 8px !important;
+.site-index .leaflet-top .leaflet-control,
+.site-export .leaflet-top .leaflet-control {
+  margin-top: 10px !important;

 }
 
 /* Rules for the main content area */
 }
 
 /* Rules for the main content area */