From 30bbffff616dd6099dd0740e4d67b21ff5676c0d Mon Sep 17 00:00:00 2001 From: Yohan Boniface Date: Fri, 30 Jun 2023 18:33:56 +0200 Subject: [PATCH 1/6] change datalayer icon --- umap/static/umap/img/24-white.svg | 12 +----------- umap/static/umap/img/24.svg | 12 +----------- umap/static/umap/img/source/24-white.svg | 14 ++------------ umap/static/umap/img/source/24.svg | 14 ++------------ 4 files changed, 6 insertions(+), 46 deletions(-) diff --git a/umap/static/umap/img/24-white.svg b/umap/static/umap/img/24-white.svg index fa1e822b..fa2d173a 100644 --- a/umap/static/umap/img/24-white.svg +++ b/umap/static/umap/img/24-white.svg @@ -34,17 +34,6 @@ - - - - - - - - - - - @@ -54,5 +43,6 @@ + diff --git a/umap/static/umap/img/24.svg b/umap/static/umap/img/24.svg index 7e3303f9..93680845 100644 --- a/umap/static/umap/img/24.svg +++ b/umap/static/umap/img/24.svg @@ -69,16 +69,6 @@ - - - - - - - - - - - + diff --git a/umap/static/umap/img/source/24-white.svg b/umap/static/umap/img/source/24-white.svg index d0f5374f..3cd531f1 100644 --- a/umap/static/umap/img/source/24-white.svg +++ b/umap/static/umap/img/source/24-white.svg @@ -2,7 +2,7 @@ - + @@ -50,17 +50,6 @@ - - - - - - - - - - - @@ -70,5 +59,6 @@ + diff --git a/umap/static/umap/img/source/24.svg b/umap/static/umap/img/source/24.svg index 69396804..33da736c 100644 --- a/umap/static/umap/img/source/24.svg +++ b/umap/static/umap/img/source/24.svg @@ -2,7 +2,7 @@ - + @@ -84,16 +84,6 @@ - - - - - - - - - - - + From a2f98f989ccab2590e9011bb0da451fe0142752f Mon Sep 17 00:00:00 2001 From: Yohan Boniface Date: Mon, 3 Jul 2023 18:53:33 +0200 Subject: [PATCH 2/6] change tilelayers icon --- umap/static/umap/img/24-white.svg | 30 +++++++++++++----- umap/static/umap/img/24.svg | 30 +++++++++++++----- umap/static/umap/img/source/24-white.svg | 39 ++++++++++++++++++------ umap/static/umap/img/source/24.svg | 39 ++++++++++++++++++------ 4 files changed, 106 insertions(+), 32 deletions(-) diff --git a/umap/static/umap/img/24-white.svg b/umap/static/umap/img/24-white.svg index fa2d173a..ea63e97f 100644 --- a/umap/static/umap/img/24-white.svg +++ b/umap/static/umap/img/24-white.svg @@ -1,4 +1,9 @@ + + + + + @@ -6,12 +11,6 @@ - - - - - - @@ -43,6 +42,23 @@ - + + + + + + + + + + + + + + + + + + diff --git a/umap/static/umap/img/24.svg b/umap/static/umap/img/24.svg index 93680845..6d760791 100644 --- a/umap/static/umap/img/24.svg +++ b/umap/static/umap/img/24.svg @@ -1,4 +1,9 @@ + + + + + @@ -15,12 +20,6 @@ - - - - - - @@ -69,6 +68,23 @@ - + + + + + + + + + + + + + + + + + + diff --git a/umap/static/umap/img/source/24-white.svg b/umap/static/umap/img/source/24-white.svg index 3cd531f1..4ebf6f8a 100644 --- a/umap/static/umap/img/source/24-white.svg +++ b/umap/static/umap/img/source/24-white.svg @@ -2,7 +2,7 @@ - + @@ -13,7 +13,17 @@ - + + + + + + + + + + + @@ -22,12 +32,6 @@ - - - - - - @@ -59,6 +63,23 @@ - + + + + + + + + + + + + + + + + + + diff --git a/umap/static/umap/img/source/24.svg b/umap/static/umap/img/source/24.svg index 33da736c..ab7c400e 100644 --- a/umap/static/umap/img/source/24.svg +++ b/umap/static/umap/img/source/24.svg @@ -2,7 +2,7 @@ - + @@ -13,7 +13,17 @@ - + + + + + + + + + + + @@ -30,12 +40,6 @@ - - - - - - @@ -84,6 +88,23 @@ - + + + + + + + + + + + + + + + + + + From 1a5276d64905855d4dd5fe228f161e0182655693 Mon Sep 17 00:00:00 2001 From: Yohan Boniface Date: Mon, 3 Jul 2023 19:04:36 +0200 Subject: [PATCH 3/6] Invert tilelayers and datalayers icons on edit toolbar --- umap/static/umap/js/umap.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/umap/static/umap/js/umap.js b/umap/static/umap/js/umap.js index d4d0c6bf..a936e652 100644 --- a/umap/static/umap/js/umap.js +++ b/umap/static/umap/js/umap.js @@ -281,8 +281,8 @@ L.U.Map.include({ const editActions = [ L.U.ImportAction, L.U.EditPropertiesAction, - L.U.ChangeTileLayerAction, L.U.ManageDatalayersAction, + L.U.ChangeTileLayerAction, L.U.UpdateExtentAction, L.U.UpdatePermsAction, ] From 4153580a6a9c0c43b4e35b42bb21b9861d4d922d Mon Sep 17 00:00:00 2001 From: Yohan Boniface Date: Mon, 3 Jul 2023 19:07:30 +0200 Subject: [PATCH 4/6] Invert datalayers and tilelayers icons in main toolbar --- umap/static/umap/js/umap.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/umap/static/umap/js/umap.js b/umap/static/umap/js/umap.js index a936e652..1d3c108b 100644 --- a/umap/static/umap/js/umap.js +++ b/umap/static/umap/js/umap.js @@ -58,9 +58,9 @@ L.U.Map.include({ 'embed', 'locate', 'measure', - 'tilelayers', 'editinosm', 'datalayers', + 'tilelayers', 'star', ], From f9e4f13e860f4d6c859ed599649534272d784f46 Mon Sep 17 00:00:00 2001 From: Yohan Boniface Date: Mon, 3 Jul 2023 20:47:25 +0200 Subject: [PATCH 5/6] Fix datalayers icon position MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Otherwise we see the top border of the icon below… --- 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 8ab5e394..5506b95f 100644 --- a/umap/static/umap/map.css +++ b/umap/static/umap/map.css @@ -219,7 +219,7 @@ ul.photon-autocomplete { background-position: -72px 0; } .manage-datalayers { - background-position: -36px -72px; + background-position: -36px -71px; } .umap-toolbar .update-map-permissions, .update-map-permissions { From d05cd1ecff93caf541dd7983b49e843c74e1ae61 Mon Sep 17 00:00:00 2001 From: Yohan Boniface Date: Mon, 3 Jul 2023 20:52:33 +0200 Subject: [PATCH 6/6] Adjust multiline icon so it does not show up on datalayer icon box --- umap/static/umap/img/24-white.svg | 8 +++----- umap/static/umap/img/source/24-white.svg | 10 ++++------ umap/static/umap/map.css | 2 +- 3 files changed, 8 insertions(+), 12 deletions(-) diff --git a/umap/static/umap/img/24-white.svg b/umap/static/umap/img/24-white.svg index ea63e97f..98e4bf9a 100644 --- a/umap/static/umap/img/24-white.svg +++ b/umap/static/umap/img/24-white.svg @@ -34,11 +34,9 @@ - - - - - + + + diff --git a/umap/static/umap/img/source/24-white.svg b/umap/static/umap/img/source/24-white.svg index 4ebf6f8a..5113d7fd 100644 --- a/umap/static/umap/img/source/24-white.svg +++ b/umap/static/umap/img/source/24-white.svg @@ -2,7 +2,7 @@ - + @@ -55,11 +55,9 @@ - - - - - + + + diff --git a/umap/static/umap/map.css b/umap/static/umap/map.css index 5506b95f..8ab5e394 100644 --- a/umap/static/umap/map.css +++ b/umap/static/umap/map.css @@ -219,7 +219,7 @@ ul.photon-autocomplete { background-position: -72px 0; } .manage-datalayers { - background-position: -36px -71px; + background-position: -36px -72px; } .umap-toolbar .update-map-permissions, .update-map-permissions {