feat: change nav flex direction

MesseBasseProduction · Dec 11, 2022 · 6db8789 · 6db8789
1 parent b28d08f
commit 6db8789
Show file tree

Hide file tree

Showing 7 changed files with 33 additions and 7 deletions.
diff --git a/front/src/BeerCrackerz.scss b/front/src/BeerCrackerz.scss
@@ -25,7 +25,7 @@ nav {
   position: absolute;
   right: 0;
   bottom: 0;
-  height: 5.8rem;
+  height: 16.8rem;
   z-index: 20;
 
   img {
@@ -37,6 +37,7 @@ nav {
 
   .cmd-bar {
     display: flex;
+    flex-direction: column;
 
     .cmd-wrapper {
       align-items: center;
@@ -46,13 +47,17 @@ nav {
       border-radius: .5rem;
       box-shadow: 0 0 1rem var(--color-bg-a9);
       display: flex;
+      height: 46px; /* Match leaflet map layers height */
       justify-content: center;
       margin-bottom: 1rem;
       margin-right: 1rem;
       padding: .2rem;
+      width: 46px; /* Match leaflet map layers width */
 
       img {
         box-shadow: inherit;
+        height: 100%;
+        width: 100%;
         transition: all .2s;
 
         &:active,

diff --git a/front/src/js/utils/enums/ClusterEnum.js b/front/src/js/utils/enums/ClusterEnum.js
@@ -12,6 +12,13 @@ export default Object.freeze({
           <span class="cluster-label">${cluster.getChildCount()}</span>
         `
       });
+    },
+    polygonOptions: {
+      fillColor: '#3ABC30',
+      color: '#3ABC30',
+      weight: 0.5,
+      opacity: 1,
+      fillOpacity: 0.4
     }
   }),
   shop: new window.L.MarkerClusterGroup({
@@ -27,6 +34,13 @@ export default Object.freeze({
           <span class="cluster-label">${cluster.getChildCount()}</span>
         `
       });
+    },
+    polygonOptions: {
+      fillColor: '#4295CF',
+      color: '#4295CF',
+      weight: 0.5,
+      opacity: 1,
+      fillOpacity: 0.4
     }
   }),
   bar: new window.L.MarkerClusterGroup({
@@ -42,6 +56,13 @@ export default Object.freeze({
           <span class="cluster-label">${cluster.getChildCount()}</span>
         `
       });
+    },
+    polygonOptions: {
+      fillColor: '#D0465D',
+      color: '#D0465D',
+      weight: 0.5,
+      opacity: 1,
+      fillOpacity: 0.4
     }
   })
 });
diff --git a/front/src/scss/utils/_leaflet.scss b/front/src/scss/utils/_leaflet.scss
@@ -20,10 +20,10 @@
   background-clip: padding-box;
   border: 2px solid var(--color-bg-a1);
   border-radius: .5rem;
-  bottom: 0;
+  bottom: 16.8rem;
   box-shadow: 0 0 1rem var(--color-bg-a9);
   position: absolute;
-  right: 17.2rem;
+  right: 0;
 
   a {
     margin-bottom: 0;

diff --git a/static/dist/BeerCrackerz.bundle.css b/static/dist/BeerCrackerz.bundle.css
diff --git a/static/dist/BeerCrackerz.bundle.js b/static/dist/BeerCrackerz.bundle.js
diff --git a/static/dist/BeerCrackerzAuth.bundle.css b/static/dist/BeerCrackerzAuth.bundle.css
diff --git a/static/dist/BeerCrackerzAuth.bundle.js b/static/dist/BeerCrackerzAuth.bundle.js