diff --git a/umap/static/umap/css/icon.css b/umap/static/umap/css/icon.css index 521e7529..dfcffa72 100644 --- a/umap/static/umap/css/icon.css +++ b/umap/static/umap/css/icon.css @@ -143,6 +143,9 @@ html[dir="rtl"] .icon { .icon-marker { background-position: calc(var(--tile) * 7) var(--tile); } +.icon-marker-plus { + background-position: calc(var(--tile) * 8) var(--tile); +} .icon-multipolygon { background-position: calc(var(--tile) * 7) calc(var(--tile) * 5); } @@ -155,6 +158,9 @@ html[dir="rtl"] .icon { .icon-polygon { background-position: calc(var(--tile) * 7) calc(var(--tile) * 4); } +.icon-polygon-plus { + background-position: calc(var(--tile) * 8) calc(var(--tile) * 4); +} .icon-polyline { background-position: calc(var(--tile) * 7) calc(var(--tile) * 6); } diff --git a/umap/static/umap/img/16-white.svg b/umap/static/umap/img/16-white.svg index 268b64ee..f61c1682 100644 --- a/umap/static/umap/img/16-white.svg +++ b/umap/static/umap/img/16-white.svg @@ -1,4 +1,4 @@ - + @@ -15,6 +15,9 @@ + + + @@ -210,5 +213,13 @@ + + + + + + + + diff --git a/umap/static/umap/img/16.svg b/umap/static/umap/img/16.svg index 6950d1f7..e33dc876 100644 --- a/umap/static/umap/img/16.svg +++ b/umap/static/umap/img/16.svg @@ -1 +1 @@ -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 index 1344048e..7bb8097b 100644 --- a/umap/static/umap/img/source/16-white.svg +++ b/umap/static/umap/img/source/16-white.svg @@ -1,7 +1,7 @@ - + @@ -18,8 +18,11 @@ + + + - + @@ -221,5 +224,13 @@ + + + + + + + + diff --git a/umap/static/umap/img/source/16.svg b/umap/static/umap/img/source/16.svg index aad5d758..454d2fad 100644 --- a/umap/static/umap/img/source/16.svg +++ b/umap/static/umap/img/source/16.svg @@ -1,4 +1,4 @@ -image/svg+xml   +image/svg+xml   diff --git a/umap/static/umap/js/umap.controls.js b/umap/static/umap/js/umap.controls.js index c2aa03e7..61c130db 100644 --- a/umap/static/umap/js/umap.controls.js +++ b/umap/static/umap/js/umap.controls.js @@ -432,8 +432,8 @@ U.Search = L.PhotonSearch.extend({ formatResult: function (feature, el) { const [tools, { point, geom }] = U.Utils.loadTemplateWithRefs(` - - + + `) geom.hidden = !['R', 'W'].includes(feature.properties.osm_type) diff --git a/umap/static/umap/map.css b/umap/static/umap/map.css index 452457be..1ca2c291 100644 --- a/umap/static/umap/map.css +++ b/umap/static/umap/map.css @@ -277,10 +277,14 @@ ul.photon-autocomplete { margin: 0; } .photon-autocomplete button:hover { - background-color: var(--color-brightCyan); + background-color: var(--color-darkCyan); +} +.photon-autocomplete button:hover i { + /* TODO deal with this in icon.css */ + background-image: url('./img/16-white.svg'); } .photon-autocomplete li.on { - border-inline-start: 4px solid var(--color-brightCyan); + border-inline-start: 4px solid var(--color-darkCyan); cursor: pointer; background-color: var(--color-lightCyan); } diff --git a/umap/static/umap/vars.css b/umap/static/umap/vars.css index a75f8164..3c6095a7 100644 --- a/umap/static/umap/vars.css +++ b/umap/static/umap/vars.css @@ -12,6 +12,7 @@ --color-limeGreen: #b9f5d2; --color-brightCyan: #46ece6; --color-lightCyan: #d4fbf9; + --color-darkCyan: #43a39f; --color-red: #c60f13; --color-darkRed: #5b2a2a;