Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand All @@ -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)
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down
42 changes: 21 additions & 21 deletions bun.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion frontend/constants.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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`,
Expand Down
7 changes: 7 additions & 0 deletions frontend/css/_blueprint_overrides.scss
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,12 @@
.bp6-icon {
top: 0.6rem;
}
.bp6-input-action {
width: 3rem;
.bp6-icon {
width: 1.75rem;
}
}
}

.bp6-popover.help {
Expand Down Expand Up @@ -149,5 +155,6 @@
*[class*=bp6-] {
&:focus {
outline: none;
box-shadow: none;
}
}
5 changes: 5 additions & 0 deletions frontend/css/components/go_button.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
31 changes: 4 additions & 27 deletions frontend/css/farm_designer/farm_designer.scss
Original file line number Diff line number Diff line change
Expand Up @@ -617,8 +617,7 @@
}
}
}
.toggle-buttons,
.z-display-toggle {
.toggle-buttons {
fieldset {
display: flex;
align-items: center;
Expand All @@ -631,6 +630,9 @@
button {
margin: 0;
}
.fb-layer-toggle {
width: 4rem;
}
}
.move-to-mode {
display: none;
Expand Down Expand Up @@ -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;
}
}
Loading
Loading