Merge pull request #143 from gebederry/dev-6

Some changes synchronous with Collector map
jeanropke · Jul 19, 2024 · 4d74549 · 4d74549
2 parents bda9761 + cb68f41
commit 4d74549
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 9 deletions.
diff --git a/assets/css/styles.css b/assets/css/styles.css
@@ -2033,7 +2033,7 @@ button.reload-nazar {
     padding: .375rem .375rem;
     background-color: rgba(255, 255, 255, .67);
     border: .125rem solid rgba(255, 255, 255, 1);
-    border-radius: 2.5rem;
+    border-radius: .25rem;
     box-shadow: rgba(0, 0, 0, .33) 0 .125rem .375rem;
     opacity: .5;
     transition: opacity .2s;
@@ -2081,7 +2081,7 @@ button.reload-nazar {
     width: 1.125rem;
     height: 1.125rem;
     border: .1875rem solid rgba(255, 255, 255, 1);
-    border-radius: 1.125rem;
+    border-radius: .25rem;
     background: rgba(var(--primary-rgb), 1) !important;
     cursor: grab;
 }
@@ -2102,7 +2102,7 @@ button.reload-nazar {
     width: 1.125rem;
     height: 1.125rem;
     border: .1875rem solid rgba(255, 255, 255, 1);
-    border-radius: 1.125rem;
+    border-radius: .25rem;
     background: rgba(var(--primary-rgb), 1) !important;
     cursor: grab;
 }

diff --git a/assets/js/lib/leaflet-zoomex.js b/assets/js/lib/leaflet-zoomex.js
@@ -36,13 +36,11 @@
       options: {
           className: "",
           zoomOutHtml: `
-<svg width="16" height="16" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg">
-<path d="M 8,0.5 A 7.5,7.5 0 0 0 0.5,8 7.5,7.5 0 0 0 8,15.5 7.5,7.5 0 0 0 15.5,8 7.5,7.5 0 0 0 8,0.5 Z m -3.5,6 h 7 c 0.554,0 1,0.446 1,1 v 1 c 0,0.554 -0.446,1 -1,1 h -7 c -0.554,0 -1,-0.446 -1,-1 v -1 c 0,-0.554 0.446,-1 1,-1 z" />
-</svg>`,
+<svg viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg" stroke="#000">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M2 4.5C2 3.11929 3.11929 2 4.5 2H19.5C20.8807 2 22 3.11929 22 4.5V19.5C22 20.8807 20.8807 22 19.5 22H4.5C3.11929 22 2 20.8807 2 19.5V4.5ZM6.5 10.5C5.94772 10.5 5.5 10.9477 5.5 11.5V12.5C5.5 13.0523 5.94772 13.5 6.5 13.5H17.5C18.0523 13.5 18.5 13.0523 18.5 12.5V11.5C18.5 10.9477 18.0523 10.5 17.5 10.5H6.5Z" fill="#333"></path></svg>`,
           zoomInHtml: `
-<svg width="16" height="16" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg">
-<path d="M 8,0.5 A 7.5,7.5 0 0 0 0.5,8 7.5,7.5 0 0 0 8,15.5 7.5,7.5 0 0 0 15.5,8 7.5,7.5 0 0 0 8,0.5 Z m -0.5,3 h 1 c 0.554,0 1,0.446 1,1 v 2 h 2 c 0.554,0 1,0.446 1,1 v 1 c 0,0.554 -0.446,1 -1,1 h -2 v 2 c 0,0.554 -0.446,1 -1,1 h -1 c -0.554,0 -1,-0.446 -1,-1 v -2 h -2 c -0.554,0 -1,-0.446 -1,-1 v -1 c 0,-0.554 0.446,-1 1,-1 h 2 v -2 c 0,-0.554 0.446,-1 1,-1 z" />
-</svg>`,
+<svg viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg" stroke="#000">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M2 4.5C2 3.11929 3.11929 2 4.5 2H19.5C20.8807 2 22 3.11929 22 4.5V19.5C22 20.8807 20.8807 22 19.5 22H4.5C3.11929 22 2 20.8807 2 19.5V4.5ZM12.5 5.5C13.0523 5.5 13.5 5.94772 13.5 6.5V10.5H17.5C18.0523 10.5 18.5 10.9477 18.5 11.5V12.5C18.5 13.0523 18.0523 13.5 17.5 13.5H13.5V17.5C13.5 18.0523 13.0523 18.5 12.5 18.5H11.5C10.9477 18.5 10.5 18.0523 10.5 17.5V13.5H6.5C5.94772 13.5 5.5 13.0523 5.5 12.5V11.5C5.5 10.9477 5.94772 10.5 6.5 10.5H10.5V6.5C10.5 5.94772 10.9477 5.5 11.5 5.5H12.5Z" fill="#333"></path></svg>`,
           zoomOutTitle: "Map Zoom Out",
           zoomInTitle: "Map Zoom In",
           sliderTitle: "Map Zoom In / Zoom Out Slider",

diff --git a/assets/js/menu.js b/assets/js/menu.js
@@ -214,6 +214,12 @@ class Menu {
         if (!_singleplayer.onMap) _singleplayer.onMap = !_singleplayer.onMap;
       });
     });
+
+    document.addEventListener('keydown', (event) => {
+      if (event.ctrlKey && event.key === ' ') {
+        document.querySelector('.menu-toggle').click();
+      }
+    });
   }
 
   static updateTippy() {