From: Tom Hughes <tom@compton.nu>
Date: Tue, 13 Aug 2024 17:46:25 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/5067'
X-Git-Tag: live~784
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/7cd7db571824a583229be914d56652517540452c?hp=591b987b9d04b1e5ec46e20ced11d6f419284a13

Merge remote-tracking branch 'upstream/pull/5067'
---

diff --git a/app/assets/javascripts/leaflet.layers.js b/app/assets/javascripts/leaflet.layers.js
index 55d492b29..82efab506 100644
--- a/app/assets/javascripts/leaflet.layers.js
+++ b/app/assets/javascripts/leaflet.layers.js
@@ -22,7 +22,7 @@ L.OSM.layers = function (options) {
         .prop("checked", map.hasLayer(layer))
         .appendTo(buttonContainer);
 
-      var item = $("<label class='btn btn-outline-primary border-4 rounded-3 bg-transparent position-absolute top-0 start-0 bottom-0 end-0 m-n1 overflow-hidden'>")
+      var item = $("<label class='btn btn-outline-primary border-4 rounded-3 bg-transparent position-absolute p-0 h-100 w-100 overflow-hidden'>")
         .prop("for", id)
         .append($("<span class='badge position-absolute top-0 start-0 rounded-top-0 rounded-start-0 py-1 px-2 bg-body bg-opacity-75 text-body text-wrap text-start fs-6 lh-base'>").append(layer.options.name))
         .appendTo(buttonContainer);
diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index a1734682e..321b0bcb9 100644
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@ -412,9 +412,12 @@ body.small-nav {
 
 .layers-ui {
   .base-layers > * {
-    height: 56px;
+    height: 3.5rem;
 
     > .btn {
+      box-sizing: content-box;
+      top: - map.get($border-widths, 4);
+      left: - map.get($border-widths, 4);
       --bs-btn-border-color: var(--bs-body-bg);
     }
     > .btn:hover {