diff --git a/umap/static/umap/img/16-white.svg b/umap/static/umap/img/16-white.svg index c1417e5b..8cf99581 100644 --- a/umap/static/umap/img/16-white.svg +++ b/umap/static/umap/img/16-white.svg @@ -1,4 +1,9 @@ + + + + + @@ -31,7 +36,6 @@ -   @@ -130,7 +134,6 @@ - @@ -138,5 +141,11 @@ + + + + + + diff --git a/umap/static/umap/img/source/16-white.svg b/umap/static/umap/img/source/16-white.svg index 82cb9904..1daaa9ea 100644 --- a/umap/static/umap/img/source/16-white.svg +++ b/umap/static/umap/img/source/16-white.svg @@ -2,8 +2,12 @@ - - + + + + + + @@ -49,7 +53,6 @@ -   @@ -151,7 +154,6 @@ - @@ -159,5 +161,11 @@ + + + + + + diff --git a/umap/static/umap/js/umap.js b/umap/static/umap/js/umap.js index 04233625..c9659080 100644 --- a/umap/static/umap/js/umap.js +++ b/umap/static/umap/js/umap.js @@ -1840,12 +1840,12 @@ L.U.Map.include({ save.textContent = L._('Save') const cancel = L.DomUtil.create( 'a', - 'leaflet-control-edit-cancel button', + 'leaflet-control-edit-cancel', container ) cancel.href = '#' cancel.title = L._('Cancel edits') - cancel.textContent = L._('Cancel') + cancel.textContent = `${L._('Cancel all')} (Ctrl+Z)` const disable = L.DomUtil.create('a', 'leaflet-control-edit-disable', container) disable.href = '#' disable.title = disable.textContent = L._('Disable editing') diff --git a/umap/static/umap/map.css b/umap/static/umap/map.css index 8630becd..c9358610 100644 --- a/umap/static/umap/map.css +++ b/umap/static/umap/map.css @@ -407,8 +407,20 @@ ul.photon-autocomplete { padding: 0 10px; min-width: 100px; } -.leaflet-container a.leaflet-control-edit-cancel { - background-color: #C60F13; +.leaflet-container a.leaflet-control-edit-save:before, +.leaflet-container a.leaflet-control-edit-cancel:before { + display: inline-block; + width: 24px; + height: 24px; + margin-left: 5px; + background-position: -50px -122px; + background-repeat: no-repeat; + background-image: url('./img/16-white.svg'); + vertical-align: middle; + content: ' '; +} +.leaflet-container a.leaflet-control-edit-save:before { + background-position: -4px -25px; } .leaflet-container a.leaflet-control-edit-save { opacity: 0.5;