From cc6249c066af2591707cf15ee685083d04f3d9f4 Mon Sep 17 00:00:00 2001 From: Luca Realdi Date: Thu, 18 Jan 2024 10:51:54 +0100 Subject: [PATCH 1/2] Workaround makimarkers --- .../plugins/leaflet/Leaflet.MakiMarkers.js | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/design/ocbootstrap/javascript/plugins/leaflet/Leaflet.MakiMarkers.js b/design/ocbootstrap/javascript/plugins/leaflet/Leaflet.MakiMarkers.js index a3a496c..be71302 100644 --- a/design/ocbootstrap/javascript/plugins/leaflet/Leaflet.MakiMarkers.js +++ b/design/ocbootstrap/javascript/plugins/leaflet/Leaflet.MakiMarkers.js @@ -37,16 +37,16 @@ defaultSize: "m", apiUrl: "https://api.tiles.mapbox.com/v3/marker/", smallOptions: { - iconSize: [20, 50], - popupAnchor: [0,-20] + iconSize: [25, 41], + popupAnchor: [0,-26] }, mediumOptions: { - iconSize: [30,70], - popupAnchor: [0,-30] + iconSize: [25, 41], + popupAnchor: [0,-26] }, largeOptions: { - iconSize: [36,90], - popupAnchor: [0,-40] + iconSize: [25, 41], + popupAnchor: [0,-26] } }; @@ -97,8 +97,10 @@ pin += "+" + options.color; } - options.iconUrl = "" + L.MakiMarkers.apiUrl + pin + ".png"; - options.iconRetinaUrl = L.MakiMarkers.apiUrl + pin + "@2x.png"; + // options.iconUrl = "" + L.MakiMarkers.apiUrl + pin + ".png"; + // options.iconRetinaUrl = L.MakiMarkers.apiUrl + pin + "@2x.png"; + options.iconUrl = "/extension/ocbootstrap/design/ocbootstrap/javascript/plugins/leaflet/images/marker-icon.png"; + options.iconRetinaUrl = "/extension/ocbootstrap/design/ocbootstrap/javascript/plugins/leaflet/images/marker-icon-2x.png"; } }); From 366bd7a7a10d4fcba32399d72b8e722367503571 Mon Sep 17 00:00:00 2001 From: snyk-bot Date: Sat, 31 Jan 2026 06:34:58 +0000 Subject: [PATCH 2/2] fix: design/ocbootstrap4/package.json to reduce vulnerabilities The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-JS-TAR-15032660 - https://snyk.io/vuln/SNYK-JS-TAR-15127355 --- design/ocbootstrap4/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/design/ocbootstrap4/package.json b/design/ocbootstrap4/package.json index d113b86..7b42460 100644 --- a/design/ocbootstrap4/package.json +++ b/design/ocbootstrap4/package.json @@ -34,7 +34,7 @@ "jquery": "^3.4.0", "popper.js": "^1.15.0", "precss": "^4.0.0", - "tar": "^4.4.8", + "tar": "^7.5.7", "themes-switch": "^1.0.5" } }