Various minor fixes: (#820)

- remove mapbox.css from concatenated mapml.css - add geolocation control to index.html - update clean-css dep of grunt cssmin plugin to version that supports container queries - add container query for scalebar to make it miss the upper left controls Close #816
Maps4HTML · Apr 11, 2023 · 8370cac · 8370cac
1 parent 2b0342b
commit 8370cac
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 13 deletions.
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -9,7 +9,7 @@ module.exports = function(grunt) {
       },
       combine: {
         files: {
-        'dist/mapml.css': ['node_modules/leaflet/dist/leaflet.css', 'node_modules/leaflet.locatecontrol/dist/L.Control.Locate.css', 'node_modules/leaflet.locatecontrol/dist/L.Control.Locate.mapbox.css', 'src/mapml.css']
+        'dist/mapml.css': ['node_modules/leaflet/dist/leaflet.css', 'node_modules/leaflet.locatecontrol/dist/L.Control.Locate.css', 'src/mapml.css']
         }
       }
     },

diff --git a/index.html b/index.html
@@ -72,7 +72,7 @@
      </noscript> 
   </head>
   <body>
-    <mapml-viewer projection="CBMTILE" zoom="2" lat="45" lon="-90" controls>
+    <mapml-viewer projection="CBMTILE" zoom="2" lat="45" lon="-90" controls controlslist="geolocation">
       <map-caption>A pleasing map of Canada</map-caption>
       <layer- label="CBMT" src="https://geogratis.gc.ca/mapml/en/cbmtile/cbmt/" checked></layer->
     </mapml-viewer>

diff --git a/package-lock.json b/package-lock.json
diff --git a/src/mapml.css b/src/mapml.css
@@ -38,11 +38,18 @@
 /*
  * Controls.
  */
-
- /* Scale bar */
+.leaflet-container {
+    container: leafletmap / size;
+} 
+/* Scale bar */
  .mapml-control-scale {
   bottom: 8px; /* Make room for map-a links */
-  left: 45px; 
+  left: 0px; 
+}
+@container leafletmap (max-height: 250px) {
+    .mapml-control-scale {
+        left: 45px; 
+    }
 }
 
  /* Generic class for seamless buttons */