diff --git a/umap/static/umap/base.css b/umap/static/umap/base.css
index 844ae097..5c64232d 100644
--- a/umap/static/umap/base.css
+++ b/umap/static/umap/base.css
@@ -683,7 +683,6 @@ input[type=hidden].blur + [type="button"] {
visibility: hidden;
position: absolute;
bottom: 0;
- padding: 10px;
border-left: 1px solid var(--color-lightGray);
overflow-x: auto;
z-index: 1010;
@@ -729,7 +728,8 @@ input[type=hidden].blur + [type="button"] {
}
#umap-panel .body {
clear: both;
- height: calc(100% - 54px); /* Minus size of toolbox */
+ height: calc(100% - 32px); /* Minus size of toolbox */
+ padding: 10px;
}
#umap-panel .toolbox {
padding: 5px 10px;
@@ -739,27 +739,30 @@ input[type=hidden].blur + [type="button"] {
font-size: 10px;
justify-content: flex-start;
gap: 5px;
+ background-color: var(--color-lightGray);
+ border-bottom: 1px solid #bbb;
+ line-height: 2.2em;
+}
+#umap-panel.dark .toolbox {
+ background-color: var(--color-darkGray);
+ border-bottom: 1px solid #232729;
}
#umap-panel .toolbox li {
- color: #2e3436;
- line-height: 32px;
cursor: pointer;
- float: right;
display: inline;
- padding: 0 7px;
+ padding: 0 2px;
border: 1px solid #b6b6b3;
border-radius: 2px;
}
+#umap-panel.dark .toolbox
#umap-panel.dark .toolbox li {
color: #d3dfeb;
border: 1px solid #202425;
}
#umap-panel .toolbox li:hover {
- color: #2e3436;
background-color: #d4d4d2;
}
#umap-panel.dark .toolbox li:hover {
- color: #eeeeec;
background-color: #353c3e;
}
.dark input, .dark textarea {
@@ -896,28 +899,19 @@ input:invalid {
.umap-close-icon {
background-repeat: no-repeat;
background-image: url('./img/16.svg');
- background-position: -28px -6px;
+ background-position: -26px -6px;
display: inline;
padding: 0 10px;
vertical-align: middle;
+ line-height: 24px;
}
.umap-resize-icon {
- background-position: -76px -150px;
+ background-position: -74px -150px;
}
.dark .umap-resize-icon,
.dark .umap-close-icon {
background-image: url('./img/16-white.svg');
}
-.dark .umap-close-link {
- border: 1px solid #202425;
- color: #eeeeec;
- padding: 0 7px;
- line-height: 32px;
- background-color: var(--color-darkGray);
-}
-.dark .umap-close-link:hover {
- background-color: #2e3436;
-}
#umap-alert-container .umap-close-link {
color: #fff;
float: right;
diff --git a/umap/static/umap/img/16-white.svg b/umap/static/umap/img/16-white.svg
index 022e413f..d3c2c6bd 100644
--- a/umap/static/umap/img/16-white.svg
+++ b/umap/static/umap/img/16-white.svg
@@ -186,7 +186,9 @@
-
-
+
+
+
+
diff --git a/umap/static/umap/img/16.svg b/umap/static/umap/img/16.svg
index e046e342..0367ddfd 100644
--- a/umap/static/umap/img/16.svg
+++ b/umap/static/umap/img/16.svg
@@ -178,7 +178,8 @@
-
-
+
+
+
diff --git a/umap/static/umap/img/source/16-white.svg b/umap/static/umap/img/source/16-white.svg
index 11ab2c03..c8dddfeb 100644
--- a/umap/static/umap/img/source/16-white.svg
+++ b/umap/static/umap/img/source/16-white.svg
@@ -16,7 +16,7 @@
-
+
@@ -208,7 +208,9 @@
-
-
+
+
+
+
diff --git a/umap/static/umap/img/source/16.svg b/umap/static/umap/img/source/16.svg
index 16569742..54925b08 100644
--- a/umap/static/umap/img/source/16.svg
+++ b/umap/static/umap/img/source/16.svg
@@ -10,7 +10,7 @@
-
+
@@ -197,7 +197,8 @@
-
-
+
+
+
diff --git a/umap/static/umap/js/umap.controls.js b/umap/static/umap/js/umap.controls.js
index 52370364..c4f1bd6d 100644
--- a/umap/static/umap/js/umap.controls.js
+++ b/umap/static/umap/js/umap.controls.js
@@ -532,7 +532,7 @@ U.DataLayer.include({
renderToolbox: function (container) {
L.DomUtil.element(
'i',
- { className: 'drag-handle', title: L._('Drag to reorder') },
+ { className: 'drag-handle show-on-edit', title: L._('Drag to reorder') },
container
)
const toggle = L.DomUtil.create('i', 'layer-toggle', container),
@@ -667,16 +667,7 @@ const ControlsMixin = {
})
container.appendChild(builder.build())
- this.ui.openPanel({ data: { html: container }, actions: [this._aboutLink()] })
- },
-
- _aboutLink: function () {
- const link = L.DomUtil.create('li', '')
- L.DomUtil.create('i', 'umap-icon-16 umap-caption', link)
- const label = L.DomUtil.create('span', '', link)
- label.textContent = label.title = L._('About')
- L.DomEvent.on(link, 'click', this.displayCaption, this)
- return link
+ this.ui.openPanel({ data: { html: container } })
},
displayCaption: function () {
diff --git a/umap/static/umap/js/umap.popup.js b/umap/static/umap/js/umap.popup.js
index e4354985..e070cef6 100644
--- a/umap/static/umap/js/umap.popup.js
+++ b/umap/static/umap/js/umap.popup.js
@@ -56,9 +56,9 @@ U.Popup.Panel = U.Popup.extend({
allButton: function () {
const button = L.DomUtil.create('li', '')
- L.DomUtil.create('i', 'umap-icon-16 umap-list', button)
+ L.DomUtil.create('i', 'umap-icon-16 umap-back', button)
const label = L.DomUtil.create('span', '', button)
- label.textContent = label.title = L._('See all')
+ button.title = L._('See all')
// Fixme: remove me when this is merged and released
// https://github.com/Leaflet/Leaflet/pull/9052
L.DomEvent.disableClickPropagation(button)
diff --git a/umap/static/umap/js/umap.ui.js b/umap/static/umap/js/umap.ui.js
index 89ee90d0..0e61caa1 100644
--- a/umap/static/umap/js/umap.ui.js
+++ b/umap/static/umap/js/umap.ui.js
@@ -39,12 +39,10 @@ U.UI = L.Evented.extend({
else body.innerHTML = e.data.html
const closeLink = L.DomUtil.create('li', 'umap-close-link', actionsContainer)
L.DomUtil.add('i', 'umap-close-icon', closeLink)
- const label = L.DomUtil.create('span', '', closeLink)
- label.title = label.textContent = L._('Close')
+ closeLink.title = L._('Close')
const resizeLink = L.DomUtil.create('li', 'umap-resize-link', actionsContainer)
L.DomUtil.add('i', 'umap-resize-icon', resizeLink)
- const resizeLabel = L.DomUtil.create('span', '', resizeLink)
- resizeLabel.title = resizeLabel.textContent = L._('Toggle size')
+ resizeLink.title = L._('Toggle size')
if (e.actions) {
for (let i = 0; i < e.actions.length; i++) {
actionsContainer.appendChild(e.actions[i])
diff --git a/umap/static/umap/map.css b/umap/static/umap/map.css
index 7d39e2d4..a2d41ddd 100644
--- a/umap/static/umap/map.css
+++ b/umap/static/umap/map.css
@@ -835,16 +835,9 @@ ul.photon-autocomplete {
}
-.leaflet-inplace-toolbar a {
- background-image: url('./img/16-white.svg');
- background-color: var(--color-darkGray)!important;
-}
.leaflet-toolbar-tip {
background-color: var(--color-darkGray);
}
-.leaflet-inplace-toolbar a:hover {
- background-color: #353c3e!important;
-}
.layer-toggle {
background-position: -49px -31px;
}
@@ -989,14 +982,10 @@ a.add-datalayer:hover {
display: block;
}
i.drag-handle {
- display: none;
background-position: -72px -73px;
cursor: move;
margin-right: 10px;
}
-.umap-edit-enabled [draggable] .drag-handle {
- display: inline-block;
-}
.umap-browser .off .feature {
display: none;
@@ -1093,9 +1082,6 @@ i.drag-handle {
padding-left: 0;
padding-right: 0;
}
-#umap-panel.umap-table-editor .toolbox li {
- float: left;
-}
.umap-table-editor .umap-close-link {
right: auto;
@@ -1171,11 +1157,14 @@ i.drag-handle {
vertical-align: middle;
}
.umap-add {
- background-position: -28px -27px;
+ background-position: -27px -27px;
}
.umap-list {
background-position: -28px -99px;
}
+.umap-back {
+ background-position: -122px -144px;
+}
.umap-list-white {
background-position: -92px -168px;
}
@@ -1726,6 +1715,13 @@ span.popup-icon {
.leaflet-inplace-toolbar {
z-index: 10000!important;
}
+.leaflet-inplace-toolbar a {
+ background-image: url('./img/16-white.svg');
+ background-color: var(--color-darkGray)!important;
+}
+.leaflet-inplace-toolbar a:hover {
+ background-color: #353c3e!important;
+}
.leaflet-touch .leaflet-control-layers, .leaflet-touch .leaflet-bar {
border-width: 1px;
}
diff --git a/umap/tests/integration/test_browser.py b/umap/tests/integration/test_browser.py
index 2912f932..5241a548 100644
--- a/umap/tests/integration/test_browser.py
+++ b/umap/tests/integration/test_browser.py
@@ -164,7 +164,7 @@ def test_data_browser_bbox_filter_should_be_persistent(
expect(browser.get_by_text("one line in new zeland")).to_be_hidden()
expect(browser.get_by_text("one polygon in greenland")).to_be_hidden()
# Close and reopen the browser to make sure this settings is persistent
- close = browser.get_by_text("Close")
+ close = browser.get_by_title("Close")
close.click()
expect(browser).to_be_hidden()
sleep(0.5)