From 10af29d01cb5700707d3a4352316b1316a18168a Mon Sep 17 00:00:00 2001 From: Yohan Boniface Date: Mon, 26 Jun 2023 07:25:40 +0200 Subject: [PATCH 01/12] WIP --- umap/static/umap/img/24.svg | 209 ++++++++++++++++++++---------------- 1 file changed, 114 insertions(+), 95 deletions(-) diff --git a/umap/static/umap/img/24.svg b/umap/static/umap/img/24.svg index 4cf1ac8d..53ff9965 100644 --- a/umap/static/umap/img/24.svg +++ b/umap/static/umap/img/24.svg @@ -8,7 +8,7 @@ version="1.1" inkscape:version="1.2.2 (b0a8486541, 2022-12-01)" sodipodi:docname="24.svg" - inkscape:export-filename="/home/ybon/Code/js/Leaflet.Storage/src/img/24.png" + inkscape:export-filename="../../../../tmp/24.svg" inkscape:export-xdpi="89.996864" inkscape:export-ydpi="89.996864" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" @@ -27,9 +27,9 @@ borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" - inkscape:zoom="3.3180469" - inkscape:cx="168.92468" - inkscape:cy="113.47037" + inkscape:zoom="3.3767157" + inkscape:cx="78.922843" + inkscape:cy="94.322422" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="true" @@ -111,30 +111,22 @@ -   + sodipodi:nodetypes="cccccccccccccc" + class="sprite" /> + inkscape:label="delete-30" + class="sprite" /> + id="measure" + transform="translate(-41.170559,-15.03125)" + class="sprite"> 1 + id="copyleft" + transform="translate(16.000002,8.0000032)" + class="sprite"> + id="tilelayers" + transform="translate(88.000001,-96.00002)" + class="sprite"> + id="marker" + class="sprite" /> + id="polyline" + class="sprite" /> + sodipodi:nodetypes="ccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc" + class="sprite" /> - + id="settings" + style="fill:#4d4d4d;fill-opacity:1" + class="sprite"> - - - + sodipodi:nodetypes="ssssscccccccc" + class="sprite" /> + + + + + + id="permissions" + style="fill:#4d4d4d;fill-opacity:1" + class="sprite" /> + style="fill:#4d4d4d;fill-opacity:1" + class="sprite" /> + id="geolocation" + style="fill:#4d4d4d;fill-opacity:1" + class="sprite" /> + id="share" + class="sprite"> + style="fill:#4d4d4d;fill-opacity:1" + class="sprite" /> + id="openstreetmap" + transform="translate(0.8783882,0.74457185)" + class="sprite"> + id="delete-marker" + transform="translate(0,3.6429698)" + class="sprite"> - - + id="multipolygon" + class="sprite"> + + + + + id="datalayers" + style="fill:#4d4d4d;fill-opacity:1" + class="sprite"> - - + + + + + sodipodi:nodetypes="ccccccccccc" + class="sprite" /> + sodipodi:nodetypes="ccccccccccc" + class="sprite" /> From df90340937dca49a05fd0783b621a46bc6f348c4 Mon Sep 17 00:00:00 2001 From: Yohan Boniface Date: Tue, 27 Jun 2023 14:01:04 +0200 Subject: [PATCH 02/12] Switch 24.png to 24.svg --- Makefile | 4 + umap/static/umap/img/24.png | Bin 16878 -> 0 bytes umap/static/umap/img/24.svg | 586 ++++------------------------- umap/static/umap/img/source/24.svg | 99 +++++ umap/static/umap/map.css | 35 +- 5 files changed, 203 insertions(+), 521 deletions(-) delete mode 100644 umap/static/umap/img/24.png create mode 100644 umap/static/umap/img/source/24.svg diff --git a/Makefile b/Makefile index 3e2af6c2..1d2ef876 100644 --- a/Makefile +++ b/Makefile @@ -84,6 +84,10 @@ lebab-all: $(jsdir)* ## Convert all JS files to modern syntax with Lebab + prett for file in $^ ; do $(MAKE) lebab filepath=$${file}; done +icons: + scour -i umap/static/umap/img/source/24.svg -o umap/static/umap/img/24.svg --strip-xml-prolog --enable-comment-stripping + + .PHONY: help help: @python -c "$$PRINT_HELP_PYSCRIPT" < $(MAKEFILE_LIST) diff --git a/umap/static/umap/img/24.png b/umap/static/umap/img/24.png deleted file mode 100644 index d6c038fbcdc031ec6f1a416eec6635cf92899243..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 16878 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 diff --git a/umap/static/umap/img/24.svg b/umap/static/umap/img/24.svg index 53ff9965..7e3303f9 100644 --- a/umap/static/umap/img/24.svg +++ b/umap/static/umap/img/24.svg @@ -1,506 +1,84 @@ - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - 0 - 1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + 0 + 1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/umap/static/umap/img/source/24.svg b/umap/static/umap/img/source/24.svg new file mode 100644 index 00000000..69396804 --- /dev/null +++ b/umap/static/umap/img/source/24.svg @@ -0,0 +1,99 @@ + + + + + + + + + + + + + + + + + + + + + + 0 + 1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/umap/static/umap/map.css b/umap/static/umap/map.css index 1c5ac552..dc384ca5 100644 --- a/umap/static/umap/map.css +++ b/umap/static/umap/map.css @@ -49,7 +49,7 @@ height: 36px; width: 36px; line-height: 36px; - background-image: url('./img/24.png'); + background-image: url('./img/24.svg'); } .leaflet-control.display-on-more, a.umap-control-less { @@ -71,31 +71,31 @@ a.umap-control-less { display: none; } .leaflet-control-embed a { - background-position: -81px -121px; + background-position: -72px -108px; } .leaflet-control-tilelayers a { - background-position: -82px -2px; + background-position: -72px 0; } .leaflet-control-home a { background-position: -122px -82px; } .leaflet-control-locate a { - background-position: -1px -121px; + background-position: 0 -108px; } .leaflet-control-locate.active a, .leaflet-control-locate.requesting a { - background-position: -80px -161px; + background-position: -72px -144px; box-shadow: 0 0 4px 0 black inset; } .leaflet-control-star a { - background-position: -118px -160px; + background-position: -108px -144px; } .leaflet-control-star.starred a { - background-position: -158px -160px; + background-position: -144px -144px; } .leaflet-control-search a { - background-position: -41px -121px; + background-position: -36px -108px; display: block; } .leaflet-control-search a.loading { @@ -115,7 +115,7 @@ a.umap-control-text { font-size: 0.8em; } .leaflet-control-edit-enable a { - background-image: url('./img/24-white.png'); + background-image: url('./img/24-white.svg'); background-position: -1px -1px; background-color: #353c3e; } @@ -199,11 +199,11 @@ ul.photon-autocomplete { background-color: #323737; border-right: 1px solid #eee; background-repeat: no-repeat; - background-image: url('./img/24.png'); + background-image: url('./img/24.svg'); background-size: auto auto; } .leaflet-control-toolbar li .leaflet-toolbar-icon.dark { - background-image: url('./img/24-white.png'); + background-image: url('./img/24-white.svg'); } .umap-toolbar { margin-top: 0; @@ -262,8 +262,8 @@ ul.photon-autocomplete { /* ********************************* */ .leaflet-control-edit-in-osm .leaflet-control-edit-in-osm-toggle { - background-image: url('img/24.png'); - background-position: -121px -121px; + background-image: url('img/24.svg'); + background-position: -108px -108px; } .leaflet-measure-control, .leaflet-control-edit-in-osm { @@ -272,7 +272,7 @@ ul.photon-autocomplete { box-shadow: none; } .leaflet-measure-control a { - background-position: -1px -81px; + background-position: 0 -72px; } .leaflet-control .leaflet-measure-toggle { display: inline-block; @@ -574,10 +574,11 @@ ul.photon-autocomplete { /* ********************************* */ .leaflet-control-browse .umap-browse-toggle { - background-image: url('./img/24.png'); + background-image: url('./img/24.svg'); width: 36px; height: 36px; - background-position: -41px -81px; + background-position: -36px -72px; + background-size: 180px; } .leaflet-control-browse .umap-browse-actions { background-color: #fff; @@ -794,7 +795,7 @@ a.add-datalayer:hover, .umap-browse-features .polygon .feature-color, .umap-browse-features .polyline .feature-color { box-shadow: 0 0 4px 0 black inset; - background-image: url('./img/24.png'); + background-image: url('./img/24.svg'); background-size: 500%; } .umap-browse-features .polyline .feature-color { From a96a1fa527570b5008dac2a2b90af3cb6f0b1a1c Mon Sep 17 00:00:00 2001 From: David Larlet Date: Tue, 27 Jun 2023 16:03:04 -0400 Subject: [PATCH 03/12] Reduce a bit the line-height for +/- zoom buttons --- 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 dc384ca5..61e2850e 100644 --- a/umap/static/umap/map.css +++ b/umap/static/umap/map.css @@ -1384,7 +1384,7 @@ a.add-datalayer:hover, .leaflet-touch .leaflet-bar a { width: 36px; height: 36px; - line-height: 36px; + line-height: 34px; } /* ****** */ From 4a43c653f11d383759c8c783d93b8d0d32631d7e Mon Sep 17 00:00:00 2001 From: Yohan Boniface Date: Wed, 28 Jun 2023 07:33:34 +0200 Subject: [PATCH 04/12] Switch 24-white.png to 24-white.svg --- Makefile | 1 + umap/static/umap/img/24-white.png | Bin 19711 -> 0 bytes umap/static/umap/img/24-white.svg | 527 +++-------------------- umap/static/umap/img/source/24-white.svg | 72 ++++ umap/static/umap/map.css | 26 +- 5 files changed, 140 insertions(+), 486 deletions(-) delete mode 100644 umap/static/umap/img/24-white.png create mode 100644 umap/static/umap/img/source/24-white.svg diff --git a/Makefile b/Makefile index 1d2ef876..0326d6b1 100644 --- a/Makefile +++ b/Makefile @@ -86,6 +86,7 @@ lebab-all: $(jsdir)* ## Convert all JS files to modern syntax with Lebab + prett icons: scour -i umap/static/umap/img/source/24.svg -o umap/static/umap/img/24.svg --strip-xml-prolog --enable-comment-stripping + scour -i umap/static/umap/img/source/24-white.svg -o umap/static/umap/img/24-white.svg --strip-xml-prolog --enable-comment-stripping .PHONY: help diff --git a/umap/static/umap/img/24-white.png b/umap/static/umap/img/24-white.png deleted file mode 100644 index e3a43024f476a7e06c067776a0050e08ae395483..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 19711 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 SZqtqc00006d diff --git a/umap/static/umap/img/24-white.svg b/umap/static/umap/img/24-white.svg index 861e45f5..7c031b72 100644 --- a/umap/static/umap/img/24-white.svg +++ b/umap/static/umap/img/24-white.svg @@ -1,475 +1,56 @@ - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - -   - - - - 0 - 1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/umap/static/umap/img/source/24-white.svg b/umap/static/umap/img/source/24-white.svg new file mode 100644 index 00000000..d16f3cf9 --- /dev/null +++ b/umap/static/umap/img/source/24-white.svg @@ -0,0 +1,72 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/umap/static/umap/map.css b/umap/static/umap/map.css index 61e2850e..1a0dd444 100644 --- a/umap/static/umap/map.css +++ b/umap/static/umap/map.css @@ -115,8 +115,7 @@ a.umap-control-text { font-size: 0.8em; } .leaflet-control-edit-enable a { - background-image: url('./img/24-white.svg'); - background-position: -1px -1px; + background-position: 0 0; background-color: #353c3e; } .leaflet-control-toolbar .leaflet-toolbar-icon.dark:hover, @@ -202,6 +201,7 @@ ul.photon-autocomplete { background-image: url('./img/24.svg'); background-size: auto auto; } +.leaflet-control-edit-enable a, .leaflet-control-toolbar li .leaflet-toolbar-icon.dark { background-image: url('./img/24-white.svg'); } @@ -210,46 +210,46 @@ ul.photon-autocomplete { } .update-map-extent, .leaflet-container .umap-toolbar .update-map-extent { - background-position: 0 -40px; + background-position: 0 -36px; } .umap-toolbar .update-map-tilelayers, .update-map-tilelayers { - background-position: -80px 0; + background-position: -72px 0; } .manage-datalayers { - background-position: -40px -80px; + background-position: -36px -72px; } .umap-toolbar .update-map-permissions, .update-map-permissions { - background-position: -40px -40px; + background-position: -36px -36px; } .umap-toolbar .upload-data, .upload-data { - background-position: -160px 0; + background-position: -144px 0; } .umap-toolbar .update-map-settings, .update-map-settings { - background-position: -120px 0; + background-position: -108px 0; } .umap-draw-marker, .umap-toolbar .umap-draw-marker { - background-position: -160px -40px; + background-position: -144px -36px; } .umap-draw-polyline, .umap-toolbar .umap-draw-polyline { - background-position: -120px -40px; + background-position: -108px -36px; } .umap-draw-polyline-multi, .umap-toolbar .umap-draw-polyline-multi { - background-position: -42px -162px; + background-position: -36px -144px; } .umap-draw-polygon, .umap-toolbar .umap-draw-polygon { - background-position: -80px -40px; + background-position: -72px -36px; } .umap-draw-polygon-multi, .umap-toolbar .umap-draw-polygon-multi { - background-position: -2px -162px; + background-position: 0 -144px; } .umap-edit-enabled .leaflet-control-toolbar > li > .leaflet-toolbar-icon, .umap-edit-enabled .umap-toolbar a { From 2e6272f8e2038e5353072a02d52887c41a9fa3a1 Mon Sep 17 00:00:00 2001 From: Yohan Boniface Date: Wed, 28 Jun 2023 07:36:08 +0200 Subject: [PATCH 05/12] Remove unused icon --- umap/static/umap/img/edit-16.png | Bin 430 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 umap/static/umap/img/edit-16.png diff --git a/umap/static/umap/img/edit-16.png b/umap/static/umap/img/edit-16.png deleted file mode 100644 index bfe389cbf921136dbc8e77e4b69339a86424036d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 430 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#Vf2=n zD-dSmmtT}V`<;yx0|TSBr;B5V zMeo$hd;ORk1rB`t&o?bAePwTF=fWidTTPqVZtqq9C^~`tgW;QgYaxg1#bQ&AopQVH zkUMi@z=_Hl*~vMZcHg|8QfAgYbK^M<#W&BcACh{wcm3*D-W(6BHicU?ey{U);R!I# z_Mc>79Np>6u{_PJ;M`q{=f752vADRbl2$F0zhSc3Z2zW(tMoi4^)D4YQdqNS6?202 z_P@L#mrZKhRc$*Ky{O>(S9H!)T|(^3f$DhnwgY91@g=+Ow*R>~lS?d7FjMTK4{M=} z{K{9cjPgSvtjj} zKfW&K!XIWfg{>~-n8WzpA!PMczDX*Tajg&6vrqL(O}CK?uikqvTXIT&P<>+LABND< Wb(eoME35~GErX}4pUXO@geCx)Sg;2G From 9056b8603f2680794e3a35bd265c515a99ff5498 Mon Sep 17 00:00:00 2001 From: Yohan Boniface Date: Wed, 28 Jun 2023 21:39:43 +0200 Subject: [PATCH 06/12] Use svg for 16 px icons too Those icons would need more love to better factorize the way they are used: - the size of the HTML element including the icon is not consistent - some icons are on the default file but could be in the white one To be done in a later step --- Makefile | 2 + umap/static/umap/img/16-white.png | Bin 12648 -> 0 bytes umap/static/umap/img/16-white.svg | 872 ++++------------------- umap/static/umap/img/16.png | Bin 11308 -> 0 bytes umap/static/umap/img/16.svg | 818 ++++----------------- umap/static/umap/img/source/16-white.svg | 157 ++++ umap/static/umap/img/source/16.svg | 159 +++++ umap/static/umap/map.css | 94 ++- 8 files changed, 637 insertions(+), 1465 deletions(-) delete mode 100644 umap/static/umap/img/16-white.png delete mode 100644 umap/static/umap/img/16.png create mode 100644 umap/static/umap/img/source/16-white.svg create mode 100644 umap/static/umap/img/source/16.svg diff --git a/Makefile b/Makefile index 0326d6b1..9d60018f 100644 --- a/Makefile +++ b/Makefile @@ -87,6 +87,8 @@ lebab-all: $(jsdir)* ## Convert all JS files to modern syntax with Lebab + prett icons: scour -i umap/static/umap/img/source/24.svg -o umap/static/umap/img/24.svg --strip-xml-prolog --enable-comment-stripping scour -i umap/static/umap/img/source/24-white.svg -o umap/static/umap/img/24-white.svg --strip-xml-prolog --enable-comment-stripping + scour -i umap/static/umap/img/source/16.svg -o umap/static/umap/img/16.svg --strip-xml-prolog --enable-comment-stripping + scour -i umap/static/umap/img/source/16-white.svg -o umap/static/umap/img/16-white.svg --strip-xml-prolog --enable-comment-stripping .PHONY: help diff --git a/umap/static/umap/img/16-white.png b/umap/static/umap/img/16-white.png deleted file mode 100644 index f7eea928c2a93d93b5a75985906e0441d163ae5a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 12648 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 - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - -   - - - - - - - - - - - - - - - - - - - - - - - - - -   - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + image/svg+xml + + + + + +   + + + + + + + + + + + + + + + + + + + + + + + +   + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/umap/static/umap/img/16.png b/umap/static/umap/img/16.png deleted file mode 100644 index 5aa09823629fdea4a36f619f72f7de3f14e8160f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 11308 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 - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + image/svg+xml + + + + + +   + + + + + + + + + + + + + + + + + + + + + + + +   + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/umap/static/umap/img/source/16-white.svg b/umap/static/umap/img/source/16-white.svg new file mode 100644 index 00000000..4583e733 --- /dev/null +++ b/umap/static/umap/img/source/16-white.svg @@ -0,0 +1,157 @@ + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + +   + + + + + + + + + + + + + + + + + + + + + + + + + +   + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/umap/static/umap/img/source/16.svg b/umap/static/umap/img/source/16.svg new file mode 100644 index 00000000..6c6b3a0a --- /dev/null +++ b/umap/static/umap/img/source/16.svg @@ -0,0 +1,159 @@ + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + +   + + + + + + + + + + + + + + + + + + + + + + + + + +   + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/umap/static/umap/map.css b/umap/static/umap/map.css index 1a0dd444..10c5d3c6 100644 --- a/umap/static/umap/map.css +++ b/umap/static/umap/map.css @@ -57,11 +57,11 @@ a.umap-control-less { } .umap-control-more, .umap-control-less { - background-image: url('./img/16-white.png'); - background-position: -121px -211px; + background-image: url('./img/16-white.svg'); + background-position: -67px -120px; } .umap-control-less { - background-position: -161px -211px; + background-position: -91px -121px; } .umap-more-controls .display-on-more, .umap-more-controls .umap-control-less { @@ -241,7 +241,7 @@ ul.photon-autocomplete { } .umap-draw-polyline-multi, .umap-toolbar .umap-draw-polyline-multi { - background-position: -36px -144px; + background-position: -36px -106px; } .umap-draw-polygon, .umap-toolbar .umap-draw-polygon { @@ -249,7 +249,7 @@ ul.photon-autocomplete { } .umap-draw-polygon-multi, .umap-toolbar .umap-draw-polygon-multi { - background-position: 0 -144px; + background-position: 0 -108px; } .umap-edit-enabled .leaflet-control-toolbar > li > .leaflet-toolbar-icon, .umap-edit-enabled .umap-toolbar a { @@ -309,13 +309,13 @@ ul.photon-autocomplete { width: 16px; height: 16px; margin-left: 5px; - background-position: -12px -12px; + background-position: -4px -4px; background-repeat: no-repeat; - background-image: url('./img/16.png'); + background-image: url('./img/16.svg'); vertical-align: middle; } .dark .umap-help-button { - background-image: url('./img/16-white.png'); + background-image: url('./img/16-white.svg'); } .umap-help-on .umap-help-box { visibility: visible; @@ -395,10 +395,10 @@ ul.photon-autocomplete { background-position: -82px -82px; } .umap-click-to-edit:hover:after { - background-image: url('./img/16.png'); + background-image: url('./img/16.svg'); } .dark .umap-click-to-edit:hover:after { - background-image: url('./img/16-white.png'); + background-image: url('./img/16-white.svg'); } .umap-caption-bar { display: none; @@ -434,10 +434,10 @@ ul.photon-autocomplete { content: '|'; color: #fff; padding-right: 10px; - background-image: url('./img/16-white.png'); + background-image: url('./img/16-white.svg'); background-repeat: no-repeat; display: inline-block; - background-position: -80px -202px; + background-position: -40px -115px; width: 20px; } .umap-edit-enabled .leaflet-top { @@ -558,9 +558,9 @@ ul.photon-autocomplete { width: 20px; height: 20px; margin-left: 5px; - background-position: -209px -130px; + background-position: -123px -75px; background-repeat: no-repeat; - background-image: url('./img/16-white.png'); + background-image: url('./img/16-white.svg'); vertical-align: middle; margin-right: 5px; border: 1px solid #202425; @@ -597,7 +597,7 @@ ul.photon-autocomplete { .umap-caption i, .umap-browse-datalayers i { background-repeat: no-repeat; - background-image: url('./img/16.png'); + background-image: url('./img/16.svg'); display: inline; padding: 0 10px; cursor: pointer; @@ -606,7 +606,7 @@ ul.photon-autocomplete { vertical-align: middle; } .dark .umap-browse-datalayers i { - background-image: url('./img/16-white.png'); + background-image: url('./img/16-white.svg'); } .umap-browse-datalayers li[draggable] .drag-handle { float: right; @@ -615,7 +615,7 @@ ul.photon-autocomplete { cursor: move; } .leaflet-inplace-toolbar a { - background-image: url('./img/16-white.png'); + background-image: url('./img/16-white.svg'); background-color: #323737!important; } .leaflet-toolbar-tip { @@ -628,54 +628,52 @@ ul.photon-autocomplete { cursor: inherit; } .layer-toggle { - background-position: -90px -51px; + background-position: -49px -31px; } .off .layer-toggle { - background-position: -130px -51px; + background-position: -73px -31px; } .feature-zoom_to { - background-position: -10px -88px; + background-position: -1px -54px; } .layer-zoom_to { - background-position: -10px -91px; + background-position: -1px -54px; } .layer-table-edit { - background-position: -90px -10px; + background-position: -50px -1px; } .feature-delete, .layer-delete { - background-position: -209px -90px; + background-position: -122px -49px; } .feature-edit, .layer-edit { - background-position: -90px -89px; + background-position: -50px -49px; } .umap-toggle-edit { - background-position: -85px -85px; + background-position: -44px -48px; } .off .layer-table-edit { - background-position: -129px -10px; + background-position: -74px -1px; } .off .layer-edit { - background-position: -90px -129px; + background-position: -51px -72px; } .off .layer-zoom_to { - background-position: -50px -91px; + background-position: -25px -54px; } .off .layer-delete { - background-position: -209px -208px; + background-position: -122px -121px; } .umap-new-hole { - background-position: -125px -165px; -} -.umap-delete-all { - background-position: -204px -85px; + background-position: -71px -94px; } .umap-delete-one-of-multi { - background-position: -165px -125px; + background-position: -97px -70px; } +.umap-delete-all, .umap-delete-one-of-one { - background-position: -204px -86px; + background-position: -119px -48px; } .umap-delete-vertex { background-position: -205px -165px; @@ -687,7 +685,7 @@ ul.photon-autocomplete { background-position: -205px -45px; } .umap-extract-shape-from-multi{ - background-position: -205px -5px; + background-position: -119px 2px; } .umap-browse-features .feature-title, .leaflet-control-browse .umap-browse-actions .layer-title { @@ -724,9 +722,9 @@ ul.photon-autocomplete { } a.add-datalayer:before, .leaflet-control-browse a.umap-browse-link:before { - background-image: url('./img/16.png'); + background-image: url('./img/16.svg'); background-repeat: no-repeat; - background-position: -92px -168px; + background-position: -45px -96px; width: 24px; height: 24px; content: " "; @@ -904,23 +902,23 @@ a.add-datalayer:hover, /* ********************************* */ .umap-icon-16 { background-repeat: no-repeat; - background-image: url('./img/16.png'); - display: inline; + background-image: url('./img/16.svg'); + display: inline-block; + height: 20px; padding: 0 10px; vertical-align: middle; } .umap-add { - background-position: -12px -49px; + background-position: -28px -27px; } .umap-list { - background-position: -52px -168px; + background-position: -28px -99px; } .umap-list-white { background-position: -92px -168px; } .umap-caption { - background-position: -170px -52px; - padding: 0 10px; + background-position: -99px -28px; } /* ********************************* */ @@ -1015,18 +1013,18 @@ a.add-datalayer:hover, height: 16px; margin-left: 5px; background-repeat: no-repeat; - background-image: url('./img/16.png'); + background-image: url('./img/16.svg'); vertical-align: middle; content: " "; } .umap-popup-footer li.zoom:before { - background-position: -12px -170px; + background-position: -5px -101px; } .umap-popup-footer li.previous:before { - background-position: -52px -130px; + background-position: -28px -77px; } .umap-popup-footer li.next:before { - background-position: -12px -130px; + background-position: -5px -77px; } From ad5057c5b8af7909ee1526eb183bb332666a1b3b Mon Sep 17 00:00:00 2001 From: Yohan Boniface Date: Wed, 28 Jun 2023 22:12:39 +0200 Subject: [PATCH 07/12] Fix click-to-edit icon position --- 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 10c5d3c6..c379132a 100644 --- a/umap/static/umap/map.css +++ b/umap/static/umap/map.css @@ -392,7 +392,7 @@ ul.photon-autocomplete { width: 26px; height: 100%; display: inline-block; - background-position: -82px -82px; + background-position: -46px -41px; } .umap-click-to-edit:hover:after { background-image: url('./img/16.svg'); From 146e58a5bce81da6529cdf0184beca87f0ee2eb5 Mon Sep 17 00:00:00 2001 From: Yohan Boniface Date: Thu, 29 Jun 2023 07:46:26 +0200 Subject: [PATCH 08/12] Update icons from base.css too A bunch of those are unused: - i.info was used in helpTooltip, but it's not anymore - umap-delete, umap-to-polyline and such was used in contextmenu, but are not anymore --- umap/static/umap/base.css | 42 ++++++++------------------------------- umap/static/umap/map.css | 26 ++++++++++++++++++++++++ 2 files changed, 34 insertions(+), 34 deletions(-) diff --git a/umap/static/umap/base.css b/umap/static/umap/base.css index 83871022..77fcb541 100644 --- a/umap/static/umap/base.css +++ b/umap/static/umap/base.css @@ -417,7 +417,7 @@ input.switch:checked ~ label:after { } i.info { background-repeat: no-repeat; - background-image: url('./img/16.png'); + background-image: url('./img/16.svg'); background-position: -170px -50px; display: inline-block; margin-left: 5px; @@ -426,7 +426,7 @@ i.info { height: 18px; } .dark i.info { - background-image: url('./img/16-white.png'); + background-image: url('./img/16-white.svg'); } .with-transition { /*transition: top .7s, right .7s, left .7s, width .7s, visibility .7s;*/ @@ -441,7 +441,7 @@ i.info { height: 24px; line-height: 24px; display: inline-block; - background-image: url('./img/24.png'); + background-image: url('./img/24.svg'); vertical-align: bottom; content: " "; } @@ -450,7 +450,7 @@ i.info { .dark .umap-clone:before, .dark .umap-edit:before, .dark .umap-download:before, .dark .umap-to-polyline:before { - background-image: url('./img/24-white.png'); + background-image: url('./img/24-white.svg'); vertical-align: middle; } .umap-to-polygon:before { @@ -474,32 +474,6 @@ i.info { .umap-download:before { background-position: -88px -168px; } -.umap-edit-actions { - padding-top: 5px; - clear: both; -} -.umap-edit-actions li { - height: 36px; - line-height: 36px; - cursor: pointer; - margin-bottom: 5px; - border-radius: 2px; - border: 1px solid #222; -} -.umap-edit-actions li i { - background-image: url('./img/24-white.png'); - background-repeat: no-repeat; - display: table-cell; - width: 36px; - height: 36px; -} -.umap-edit-actions li span { - display: table-cell; - vertical-align: middle; -} -.umap-edit-actions li:hover { - background-color: #353c3e; -} .permissions-panel, .umap-upload, .umap-share, @@ -808,14 +782,14 @@ input[type=hidden].blur + .button { /* *********** */ .umap-close-icon { background-repeat: no-repeat; - background-image: url('./img/16.png'); - background-position: -52px -13px; + background-image: url('./img/16.svg'); + background-position: -28px -6px; display: inline; padding: 0 10px; vertical-align: middle; } .dark .umap-close-icon { - background-image: url('./img/16-white.png'); + background-image: url('./img/16-white.svg'); } .dark .umap-close-link { border: 1px solid #202425; @@ -833,7 +807,7 @@ input[type=hidden].blur + .button { padding-right: 10px; } #umap-alert-container .umap-close-icon { - background-position: -128px -93px; + background-position: -74px -55px; } diff --git a/umap/static/umap/map.css b/umap/static/umap/map.css index c379132a..a9e69016 100644 --- a/umap/static/umap/map.css +++ b/umap/static/umap/map.css @@ -326,6 +326,32 @@ ul.photon-autocomplete { border-top: 1px solid #aaa; padding-top: 10px; } +.umap-edit-actions { + padding-top: 5px; + clear: both; +} +.umap-edit-actions li { + height: 36px; + line-height: 36px; + cursor: pointer; + margin-bottom: 5px; + border-radius: 2px; + border: 1px solid #222; +} +.umap-edit-actions li i { + background-image: url('./img/24-white.svg'); + background-repeat: no-repeat; + display: table-cell; + width: 36px; + height: 36px; +} +.umap-edit-actions li span { + display: table-cell; + vertical-align: middle; +} +.umap-edit-actions li:hover { + background-color: #353c3e; +} /* ********************************* */ From 86bff268ba72d2e878b9180d5c87d493ecc21245 Mon Sep 17 00:00:00 2001 From: Yohan Boniface Date: Thu, 29 Jun 2023 22:23:23 +0200 Subject: [PATCH 09/12] Move arrow icon to 24px So we have more space around, otherwise there 1px of the narrow icons appear. --- umap/static/umap/img/16-white.svg | 2 -- umap/static/umap/img/24-white.svg | 2 ++ umap/static/umap/img/source/16-white.svg | 4 +--- umap/static/umap/img/source/24-white.svg | 4 +++- umap/static/umap/map.css | 6 +++--- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/umap/static/umap/img/16-white.svg b/umap/static/umap/img/16-white.svg index 0c2e25bd..7a3f3bbc 100644 --- a/umap/static/umap/img/16-white.svg +++ b/umap/static/umap/img/16-white.svg @@ -129,8 +129,6 @@ - - diff --git a/umap/static/umap/img/24-white.svg b/umap/static/umap/img/24-white.svg index 7c031b72..fa1e822b 100644 --- a/umap/static/umap/img/24-white.svg +++ b/umap/static/umap/img/24-white.svg @@ -52,5 +52,7 @@ + + diff --git a/umap/static/umap/img/source/16-white.svg b/umap/static/umap/img/source/16-white.svg index 4583e733..4ddaa49f 100644 --- a/umap/static/umap/img/source/16-white.svg +++ b/umap/static/umap/img/source/16-white.svg @@ -3,7 +3,7 @@ - + @@ -150,8 +150,6 @@ - - diff --git a/umap/static/umap/img/source/24-white.svg b/umap/static/umap/img/source/24-white.svg index d16f3cf9..d0f5374f 100644 --- a/umap/static/umap/img/source/24-white.svg +++ b/umap/static/umap/img/source/24-white.svg @@ -2,7 +2,7 @@ - + @@ -68,5 +68,7 @@ + + diff --git a/umap/static/umap/map.css b/umap/static/umap/map.css index a9e69016..3f71f6e2 100644 --- a/umap/static/umap/map.css +++ b/umap/static/umap/map.css @@ -57,11 +57,11 @@ a.umap-control-less { } .umap-control-more, .umap-control-less { - background-image: url('./img/16-white.svg'); - background-position: -67px -120px; + background-image: url('./img/24-white.svg'); + background-position: -109px -476px; } .umap-control-less { - background-position: -91px -121px; + background-position: -73px -475px; } .umap-more-controls .display-on-more, .umap-more-controls .umap-control-less { From fa742a329f121470762e25e1dfd965d09e7212c8 Mon Sep 17 00:00:00 2001 From: Yohan Boniface Date: Thu, 29 Jun 2023 22:30:57 +0200 Subject: [PATCH 10/12] Move border of arrow more/less box to div to better align with other icons --- umap/static/umap/js/umap.controls.js | 6 +++--- umap/static/umap/map.css | 18 ++++++++++-------- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/umap/static/umap/js/umap.controls.js b/umap/static/umap/js/umap.controls.js index 486cea80..16a34bb8 100644 --- a/umap/static/umap/js/umap.controls.js +++ b/umap/static/umap/js/umap.controls.js @@ -359,9 +359,9 @@ L.U.MoreControls = L.Control.extend({ }, onAdd: function () { - const container = L.DomUtil.create('div', ''), - more = L.DomUtil.create('a', 'umap-control-more umap-control-text', container), - less = L.DomUtil.create('a', 'umap-control-less umap-control-text', container) + const container = L.DomUtil.create('div', 'umap-control-text'), + more = L.DomUtil.create('a', 'umap-control-more', container), + less = L.DomUtil.create('a', 'umap-control-less', container) more.href = '#' more.title = L._('More controls') diff --git a/umap/static/umap/map.css b/umap/static/umap/map.css index 3f71f6e2..a780cc3c 100644 --- a/umap/static/umap/map.css +++ b/umap/static/umap/map.css @@ -58,10 +58,10 @@ a.umap-control-less { .umap-control-more, .umap-control-less { background-image: url('./img/24-white.svg'); - background-position: -109px -476px; + background-position: -108px -476px; } .umap-control-less { - background-position: -73px -475px; + background-position: -72px -474px; } .umap-more-controls .display-on-more, .umap-more-controls .umap-control-less { @@ -101,12 +101,7 @@ a.umap-control-less { .leaflet-control-search a.loading { background-image: url('./img/search.gif'); } -a.umap-control-text { - float: right; - margin: 0; - width: 36px; - height: 23px; - line-height: 23px; +.umap-control-text { border: 1px solid #444; border-radius: 2px; background-color: #666; @@ -114,6 +109,13 @@ a.umap-control-text { text-align: center; font-size: 0.8em; } +.umap-control-text a { + float: right; + margin: 0; + width: 36px; + height: 23px; + line-height: 23px; +} .leaflet-control-edit-enable a { background-position: 0 0; background-color: #353c3e; From a27db078791dc03a319800acd0ca6f7d009d759a Mon Sep 17 00:00:00 2001 From: Yohan Boniface Date: Thu, 29 Jun 2023 22:36:13 +0200 Subject: [PATCH 11/12] Use correct arrow more/less --- umap/static/umap/map.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/umap/static/umap/map.css b/umap/static/umap/map.css index a780cc3c..62aa8c45 100644 --- a/umap/static/umap/map.css +++ b/umap/static/umap/map.css @@ -58,10 +58,10 @@ a.umap-control-less { .umap-control-more, .umap-control-less { background-image: url('./img/24-white.svg'); - background-position: -108px -476px; + background-position: -72px -474px; } .umap-control-less { - background-position: -72px -474px; + background-position: -108px -476px; } .umap-more-controls .display-on-more, .umap-more-controls .umap-control-less { From 78d0f13f9722541c4723da902c5fdfb142c36c61 Mon Sep 17 00:00:00 2001 From: Yohan Boniface Date: Thu, 29 Jun 2023 22:41:29 +0200 Subject: [PATCH 12/12] Change arrow box border --- 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 62aa8c45..8ab5e394 100644 --- a/umap/static/umap/map.css +++ b/umap/static/umap/map.css @@ -102,7 +102,7 @@ a.umap-control-less { background-image: url('./img/search.gif'); } .umap-control-text { - border: 1px solid #444; + border: 1px solid #666; border-radius: 2px; background-color: #666; color: #f8f8f8;