From 8701358b2b908bc79a09d7c9f70ecb1ba007f276 Mon Sep 17 00:00:00 2001 From: Yohan Boniface Date: Fri, 16 Jun 2023 19:06:31 +0200 Subject: [PATCH 1/3] Remove DOM unused element from popup --- umap/static/umap/js/umap.popup.js | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/umap/static/umap/js/umap.popup.js b/umap/static/umap/js/umap.popup.js index b6eb317f..b65807f0 100644 --- a/umap/static/umap/js/umap.popup.js +++ b/umap/static/umap/js/umap.popup.js @@ -116,12 +116,7 @@ L.U.PopupTemplate.Default = L.Class.extend({ renderFooter: function () { if (this.feature.hasPopupFooter()) { - const footerContainer = L.DomUtil.create( - 'div', - 'umap-footer-container', - this.container - ), - footer = L.DomUtil.create('ul', 'umap-popup-footer', footerContainer), + const footer = L.DomUtil.create('ul', 'umap-popup-footer', this.container), previousLi = L.DomUtil.create('li', 'previous', footer), zoomLi = L.DomUtil.create('li', 'zoom', footer), nextLi = L.DomUtil.create('li', 'next', footer), From 4ee33c04349c92af9e764d6e6284ec45be2e7eb0 Mon Sep 17 00:00:00 2001 From: Yohan Boniface Date: Fri, 16 Jun 2023 19:06:53 +0200 Subject: [PATCH 2/3] Move overflow-y directive to umap-popup-content fix #1146 --- umap/static/umap/map.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/umap/static/umap/map.css b/umap/static/umap/map.css index ca1c00d1..b303047d 100644 --- a/umap/static/umap/map.css +++ b/umap/static/umap/map.css @@ -1317,7 +1317,6 @@ a.add-datalayer:hover, } .leaflet-popup-content-wrapper { border-radius: 4px; - overflow-y: scroll; } .umap-popup-content { max-height: 500px; @@ -1325,6 +1324,7 @@ a.add-datalayer:hover, margin-bottom: 4px; display: flex; flex-direction: column; + overflow-y: scroll; } .umap-popup-content iframe { min-width: 310px; From b04016d3052a343b970e9d0d40f344af3db11a63 Mon Sep 17 00:00:00 2001 From: Yohan Boniface Date: Fri, 16 Jun 2023 19:32:01 +0200 Subject: [PATCH 3/3] Remove unused CSS class --- umap/static/umap/base.css | 1 - 1 file changed, 1 deletion(-) diff --git a/umap/static/umap/base.css b/umap/static/umap/base.css index 13719a88..83871022 100644 --- a/umap/static/umap/base.css +++ b/umap/static/umap/base.css @@ -506,7 +506,6 @@ i.info { .umap-edit-container, .umap-datalayer-container, .umap-layer-properties-container, -.umap-footer-container, .umap-browse-data, .umap-filter-data, .umap-browse-datalayers {