Merge pull request #2519 from FarmBot/staging

v15.27.0

Author: gabrielburnworth

Gemfile.lock

@@ -111,7 +111,7 @@ GEM
     database_cleaner-active_record (2.2.2)
       activerecord (>= 5.a)
       database_cleaner-core (~> 2.0)
-    database_cleaner-core (2.0.1)
+    database_cleaner-core (2.1.0)
     date (3.5.1)
     declarative (0.0.20)
     delayed_job (4.1.13)
@@ -148,7 +148,7 @@ GEM
       logger
     faraday-follow_redirects (0.5.0)
       faraday (>= 1, < 3)
-    faraday-net_http (3.4.3)
+    faraday-net_http (3.4.4)
       net-http (~> 0.5)
     globalid (1.3.0)
       activesupport (>= 6.1)
@@ -162,7 +162,7 @@ GEM
       retriable (~> 3.1)
     google-apis-iamcredentials_v1 (0.27.0)
       google-apis-core (>= 0.15.0, < 2.a)
-    google-apis-storage_v1 (0.62.0)
+    google-apis-storage_v1 (0.63.0)
       google-apis-core (>= 0.15.0, < 2.a)
     google-cloud-core (1.8.0)
       google-cloud-env (>= 1.0, < 3.a)
@@ -283,7 +283,7 @@ GEM
       reline (>= 0.6.0)
     pry-rails (0.3.11)
       pry (>= 0.13.0)
-    psych (5.3.1)
+    psych (5.4.0)
       date
       stringio
     public_suffix (7.0.5)
@@ -383,7 +383,7 @@ GEM
     rspec-support (3.13.7)
     rspec_junit_formatter (0.6.0)
       rspec-core (>= 2, < 4, != 2.12.0)
-    rubocop (1.86.2)
+    rubocop (1.87.0)
       json (~> 2.3)
       language_server-protocol (~> 3.17.0.2)
       lint_roller (~> 1.1.0)

bun.lock

@@ -2307,7 +2307,7 @@ export enum DeviceSetting {
   showReadingsMapLayer = `Show Readings Map Layer`,
   showMoisture = `Moisture`,
   showMoistureInterpolationMapLayer = `Show Moisture Interpolation Map Layer`,
-  show3DMap = `3D Map beta`,
+  show3DMap = `3D beta`,
 
   // Controls
   invertJogButtonXAxis = `X Axis`,

frontend/constants.ts

@@ -55,6 +55,12 @@
   .bp6-icon {
     top: 0.6rem;
   }
+  .bp6-input-action {
+    width: 3rem;
+    .bp6-icon {
+      width: 1.75rem;
+    }
+  }
 }
 
 .bp6-popover.help {
@@ -149,5 +155,6 @@
 *[class*=bp6-] {
   &:focus {
     outline: none;
+    box-shadow: none;
   }
 }

frontend/css/_blueprint_overrides.scss

@@ -9,6 +9,11 @@
     height: 3rem !important;
     padding: 0 1rem;
   }
+  .bp6-popover-content {
+    button {
+      font-size: 1.1rem;
+    }
+  }
   .go-button-axes-text {
     border-top-right-radius: 0;
     border-bottom-right-radius: 0;

frontend/css/components/go_button.scss

@@ -617,8 +617,7 @@
       }
     }
   }
-  .toggle-buttons,
-  .z-display-toggle {
+  .toggle-buttons {
     fieldset {
       display: flex;
       align-items: center;
@@ -631,6 +630,9 @@
     button {
       margin: 0;
     }
+    .fb-layer-toggle {
+      width: 4rem;
+    }
   }
   .move-to-mode {
     display: none;
@@ -807,28 +809,3 @@
     transform: translateX(-22.5rem);
   }
 }
-
-.three-d-map-toggle-menu {
-  position: fixed;
-  bottom: 0;
-  right: 0;
-  padding: 1rem;
-  button {
-    height: 3.5rem;
-    width: 3.5rem;
-    i {
-      font-size: 1.5rem;
-    }
-    &.active {
-      background-color: $blue !important;
-    }
-  }
-  .three-d-map-toggle {
-    padding: 0 1.5rem;
-    background-color: var(--main-bg);
-    backdrop-filter: var(--blur);
-    border-radius: 0.5rem;
-    box-shadow: var(--box-shadow);
-    height: 3.5rem;
-  }
-}