From 8370cace9bbc08a79fd28a15dc3a90f962dbef26 Mon Sep 17 00:00:00 2001 From: Peter Rushforth Date: Tue, 11 Apr 2023 12:06:37 -0400 Subject: [PATCH] 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 --- Gruntfile.js | 2 +- index.html | 2 +- package-lock.json | 16 ++++++++-------- src/mapml.css | 13 ++++++++++--- 4 files changed, 20 insertions(+), 13 deletions(-) diff --git a/Gruntfile.js b/Gruntfile.js index d3c492929..561318bfa 100644 --- 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 index e98405f41..0d0471ce6 100644 --- a/index.html +++ b/index.html @@ -72,7 +72,7 @@ - + A pleasing map of Canada diff --git a/package-lock.json b/package-lock.json index 71079f776..86cf1b2fe 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2585,9 +2585,9 @@ } }, "node_modules/clean-css": { - "version": "5.2.2", - "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-5.2.2.tgz", - "integrity": "sha512-/eR8ru5zyxKzpBLv9YZvMXgTSSQn7AdkMItMYynsFgGwTveCRVam9IUPFloE85B4vAIj05IuKmmEoV7/AQjT0w==", + "version": "5.3.2", + "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-5.3.2.tgz", + "integrity": "sha512-JVJbM+f3d3Q704rF4bqQ5UUyTtuJ0JRKNbTKVEeujCCBoMdkEi+V+e8oktO9qGQNSvHrFTM6JZRXrUvGR1czww==", "dev": true, "dependencies": { "source-map": "~0.6.0" @@ -4590,7 +4590,7 @@ "dev": true, "dependencies": { "chalk": "^4.1.0", - "clean-css": "^5.0.1", + "clean-css": "^5.3.2", "maxmin": "^3.0.0" }, "engines": { @@ -14252,9 +14252,9 @@ } }, "clean-css": { - "version": "5.2.2", - "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-5.2.2.tgz", - "integrity": "sha512-/eR8ru5zyxKzpBLv9YZvMXgTSSQn7AdkMItMYynsFgGwTveCRVam9IUPFloE85B4vAIj05IuKmmEoV7/AQjT0w==", + "version": "5.3.2", + "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-5.3.2.tgz", + "integrity": "sha512-JVJbM+f3d3Q704rF4bqQ5UUyTtuJ0JRKNbTKVEeujCCBoMdkEi+V+e8oktO9qGQNSvHrFTM6JZRXrUvGR1czww==", "dev": true, "requires": { "source-map": "~0.6.0" @@ -15820,7 +15820,7 @@ "dev": true, "requires": { "chalk": "^4.1.0", - "clean-css": "^5.0.1", + "clean-css": "^5.3.2", "maxmin": "^3.0.0" }, "dependencies": { diff --git a/src/mapml.css b/src/mapml.css index 7363b4f5b..26586ebe2 100644 --- 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 */