Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
8705977
combine jobs and logs tabs
roryaronson Sep 17, 2025
a877dce
table height adjustments
roryaronson Sep 17, 2025
596b7be
add option to demo the app to login page
roryaronson Sep 17, 2025
d62cf06
minor style improvements
roryaronson Sep 17, 2025
6d7c94a
log filter menu fixes
roryaronson Sep 17, 2025
32c4685
dry up demo seed data selector
roryaronson Sep 17, 2025
bc93e18
dry up demoButton
roryaronson Sep 18, 2025
e63d8c8
add order number to farmbot info
roryaronson Sep 18, 2025
3c0b67c
better setup wizard icons and hierarchy
roryaronson Sep 18, 2025
10712a8
add setup wizard button to settings cog menu
roryaronson Sep 18, 2025
4ab3a88
add logout button to connectivity popup
roryaronson Sep 18, 2025
6a895fe
status ticker fix
roryaronson Sep 18, 2025
77dd317
move dark mode toggle to settings panel
roryaronson Sep 18, 2025
75cf2ac
move app version to settings panel
roryaronson Sep 18, 2025
bc3c0e9
remove account menu
roryaronson Sep 18, 2025
99ddb8d
update tests
roryaronson Sep 18, 2025
96fa1b0
fix <html> element does not have a [lang] attribute
roryaronson Sep 18, 2025
c580ae2
fix aria attributes
roryaronson Sep 18, 2025
646e1ba
add missing image alt texts
roryaronson Sep 18, 2025
35c1d7e
improve contrast
roryaronson Sep 18, 2025
a73bc70
skip to main content link
roryaronson Sep 18, 2025
5adff97
font swap fallbacks and font variables
roryaronson Sep 18, 2025
519baff
more font cleanup
roryaronson Sep 18, 2025
77c28d4
lint
roryaronson Sep 18, 2025
4ecbe59
fix test
roryaronson Sep 18, 2025
c7c4f7b
test undefined language
roryaronson Sep 18, 2025
d2b320a
add device name fallback test
roryaronson Sep 19, 2025
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
2 changes: 0 additions & 2 deletions app/views/dashboard/_common_assets.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,3 @@ window.process = {
<%= render "addons" %>
<%= javascript_include_tag *@js_assets %>
<meta content="width=device-width, initial-scale=1" name="viewport">
<link href="https://fonts.googleapis.com/css?family=Cabin:300,300i,400,400i,700,700i" rel="stylesheet">
<link href="https://fonts.googleapis.com/css?family=Inknut+Antiqua:300,300i,400,400i,700,700i" rel="stylesheet">
2 changes: 1 addition & 1 deletion app/views/dashboard/demo.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
bottom: 60px;
box-shadow: 0 0 15px rgba(0,0,0,0.4);
color: #fff;
font-family: "Cabin", sans-serif;
font-family: "Cabin", "Cabin Fallback", sans-serif;
font-size: 25px;
font-weight: bold;
padding: 15px 30px;
Expand Down
4 changes: 1 addition & 3 deletions app/views/layouts/dashboard.html.erb
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<!DOCTYPE html>
<html>
<html lang="<%= I18n.locale %>">
<head>
<meta content='text/html; charset=UTF-8' http-equiv='Content-Type'>
<meta content="width=device-width, initial-scale=1" name="viewport">
Expand All @@ -18,8 +18,6 @@
text-align: center; width: 100%; padding-top: 10%; color: #434343; }
</style>
<%= stylesheet_link_tag *@css_assets %>
<link href="https://fonts.googleapis.com/css?family=Cabin:300,300i,400,400i,700,700i" rel="stylesheet">
<link href="https://fonts.googleapis.com/css?family=Inknut+Antiqua:300,300i,400,400i,700,700i" rel="stylesheet">
<link rel="icon" href="/favicon.ico" type="image/x-icon">
<link rel="apple-touch-icon" href="/images/favicon.png" type="image/png">
<% manifest_file =
Expand Down
4 changes: 2 additions & 2 deletions app/views/layouts/mailer.html.erb
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<!DOCTYPE html>
<html>
<html lang="<%= I18n.locale %>">
<head>
<meta content='text/html; charset=UTF-8' http-equiv='Content-Type' />
</head>
<body>
<%= yield %>
</body>
</html>
</html>
14 changes: 8 additions & 6 deletions frontend/app.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -213,12 +213,14 @@ export class RawApp extends React.Component<AppProps, {}> {
appState={this.props.appState}
menuOpen={this.props.menuOpen}
pings={this.props.pings} />}
{syncLoaded && this.props.children}
<ErrorBoundary>
<React.Suspense>
{syncLoaded && <Outlet />}
</React.Suspense>
</ErrorBoundary>
<main id="main-content" tabIndex={-1}>
{syncLoaded && this.props.children}
<ErrorBoundary>
<React.Suspense>
{syncLoaded && <Outlet />}
</React.Suspense>
</ErrorBoundary>
</main>
<div className={"toast-container"}>
<TourStepContainer
key={JSON.stringify(this.props.helpState)}
Expand Down
4 changes: 0 additions & 4 deletions frontend/constants.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1491,10 +1491,6 @@ export namespace TourContent {
same button to UNLOCK the device before resuming execution of any
commands.`);

export const ACCOUNT_MENU =
trim(`This is the account menu, providing you with links to other pages
in the app, and for logging out.`);

export const GETTING_STARTED_END =
trim(`Thanks for taking the Getting Started Tour! You're now ready to
dive into the details of each panel and begin planting your first
Expand Down
92 changes: 12 additions & 80 deletions frontend/css/app/navbar.scss
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,11 @@
background: linear-gradient(0deg, transparent, $translucent3 60%, $translucent5), linear-gradient(0deg, transparent 30%, $translucent3);
}

.skip-nav-link {
display: none;
}

nav {
margin-top: 3rem;
button {
margin: 1.8rem 1.8rem 0 0;
font-size: 1.3rem !important;
Expand Down Expand Up @@ -177,21 +180,24 @@ nav {
.nav-coordinates,
.jobs-button,
.setup-button,
.connectivity-button,
.nav-name {
.connectivity-button {
margin: 0;
display: flex;
position: relative;
gap: 0.5rem;
align-items: center;
height: 2.9rem;
overflow: hidden;
border-radius: 5px;
border: none;
cursor: pointer;
font-weight: bold;
padding-left: 0.8rem;
padding-right: 0.8rem;
font-weight: bold;
font-size: 1.1rem;
line-height: 3rem;
color: $light_gray;
color: $off_white;
background: $medium_gray;
user-select: none;
&:hover {
Expand Down Expand Up @@ -255,6 +261,7 @@ nav {
.connectivity-button {
p {
font-weight: bold;
max-width: 17rem;
}
}
.connection-status-popover {
Expand All @@ -273,81 +280,13 @@ nav {
}
}

.menu-popover {
.bp6-popover-content {
position: relative;
width: 22rem;
padding: 0;
font-size: 1.2rem;
letter-spacing: 1.2px;
color: var(--text-color);
i {
margin-right: 0.8rem;
}
a:not(.app-version) {
display: inline-block;
width: 100%;
text-transform: uppercase;
padding: 0.5rem 1rem;
}
img {
margin-right: 0.8rem;
}
.app-version {
padding: 0.5rem 1rem 0;
margin-top: 0.5rem;
border-top: 1px solid var(--border-color);
label {
font-weight: normal;
}
a {
text-align: right;
border-radius: 0.5rem;
}
}
.dark-mode-toggle {
padding: 0.5rem 1rem;
line-height: 1.8rem;
label {
font-weight: normal;
}
.fb-button {
margin: 0;
}
}
}
.bp6-popover-arrow {
visibility: hidden;
}
.fa-user {
width: 2.75rem;
height: 2.75rem;
padding: 0.75rem;
border-radius: 5px;
&:hover {
background: rgba(255, 255, 255, 0.2);
}
}
}

body:has(.app.dark) {
.menu-popover {
.bp6-popover-content {
img {
filter: invert(0.75);
}
}
}
}

body:has(.app.light) {
.nav-right {
.time-travel-button,
.nav-coordinates,
.jobs-button,
.setup-button,
.connectivity-button,
.nav-name {
.connectivity-button {
&.hover {
background: var(--main-bg);
color: var(--text-color);
Expand Down Expand Up @@ -410,13 +349,6 @@ body:has(.app.light) {
}
}

.nav-additional-menu {
padding: 0.5rem 0;
a:hover {
background: var(--secondary-bg);
}
}

.read-only-icon {
.fa-ban {
color: $red;
Expand Down
9 changes: 5 additions & 4 deletions frontend/css/app/static_pages.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
@use "../variables" as *;
@use "sass:color";
@use "../global/fonts" as *;

.static-page {
min-height: 100vh;
Expand All @@ -9,13 +10,13 @@
padding: 8rem 2rem;
h1,
h2 {
font-family: "Cabin", Arial, Helvetica, sans-serif !important;
font-family: $cabin !important;
font-weight: 100 !important;
color: $white;
text-shadow: 0 0 25px rgba(0, 0, 0, 0.1), 0 0 25px rgba(0, 0, 0, 0.1);
}
h1 {
font-family: "Inknut Antiqua" !important;
font-family: $inknut !important;
font-weight: bold !important;
font-size: 3.4rem;
line-height: 3.6rem;
Expand Down Expand Up @@ -242,7 +243,7 @@
background: $cyan;
border-radius: 5px 5px 0 0;
.btn-title {
font-family: "Inknut Antiqua";
font-family: $inknut;
font-weight: bold;
margin-bottom: 0.5rem !important;
padding-top: 0.75rem;
Expand Down Expand Up @@ -329,7 +330,7 @@
}
h1 {
margin: 0;
font-family: "Inknut Antiqua" !important;
font-family: $inknut !important;
font-weight: 600 !important;
}
}
Expand Down
8 changes: 2 additions & 6 deletions frontend/css/app/status_ticker.scss
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,6 @@
@use "sass:color";

.ticker-list {
position: fixed;
top: 0;
left: 0;
right: 0;
z-index: 3;
background: var(--main-bg);
backdrop-filter: var(--blur);
Expand Down Expand Up @@ -98,8 +94,8 @@

// background: linear-gradient(to top, black 0%, transparent 30%);
.status-ticker-message {
display: inline;
letter-spacing: 0.1rem;
letter-spacing: 0.05rem;
overflow: hidden;
span {
-webkit-animation: flash 1.5s ease-in;
animation: flash 1.5s ease-in;
Expand Down
3 changes: 2 additions & 1 deletion frontend/css/app/toastr.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
@use "../variables" as *;
@use "sass:color";
@use "../global/fonts" as *;

.toast-container {
display: flex;
Expand Down Expand Up @@ -95,7 +96,7 @@
pointer-events: none;
font-size: 1.6rem;
font-weight: bold;
font-family: 'Inknut Antiqua', serif;
font-family: $inknut;
}

.toast-message {
Expand Down
7 changes: 3 additions & 4 deletions frontend/css/farm_designer/farm_designer.scss
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
}
&.panel-closed-mobile,
&.panel-closed {
top: 15rem;
top: 13rem;
}
}
}
Expand Down Expand Up @@ -535,8 +535,8 @@
}

.garden-map-legend {
position: fixed;
top: 8rem;
position: absolute;
top: 7.5rem;
right: -155px;
z-index: 3;
transition: all 0.3s ease;
Expand Down Expand Up @@ -628,7 +628,6 @@
}
button {
margin: 0;
width: 5rem;
}
}
.move-to-mode {
Expand Down
5 changes: 3 additions & 2 deletions frontend/css/farm_designer/farm_designer_panels.scss
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
@use "../variables" as *;
@use "sass:color";
@use "../global/fonts" as *;

.farm-designer-panels {
position: fixed;
position: absolute;
top: 7.5rem;
width: 45rem;
margin: 1rem;
Expand Down Expand Up @@ -305,7 +306,7 @@
overflow-y: auto;
overflow-x: hidden;
width: calc(100% - 75px);
font-family: "Cabin", sans-serif;
font-family: $cabin;
}
.saving-indicator {
position: absolute;
Expand Down
9 changes: 5 additions & 4 deletions frontend/css/farm_designer/three_d_garden.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
@use "../variables" as *;
@use "sass:color";
@use "../global/fonts" as *;

.three-d-garden-loading-container,
.promo-loading-container {
Expand All @@ -26,7 +27,7 @@

.three-d-garden-loading-text,
.promo-loading-text {
font-family: 'Inknut Antiqua', sans-serif;
font-family: $inknut;
font-size: 2rem;
font-weight: bold;
color: $off_white;
Expand Down Expand Up @@ -131,7 +132,7 @@

.setting-title {
color: $off_white;
font-family: 'Inknut Antiqua';
font-family: $inknut;
text-shadow: 0 0 10px black;
line-height: 1.8rem;
text-align: center;
Expand Down Expand Up @@ -371,7 +372,7 @@

.title {
margin: 0;
font-family: 'Inknut Antiqua';
font-family: $inknut;
font-size: 3.5rem;
line-height: 5rem;
font-weight: bold;
Expand Down Expand Up @@ -477,7 +478,7 @@
font-size: 1rem;
h2 {
margin: 0;
font-family: 'Inknut Antiqua';
font-family: $inknut;
line-height: 100%;
font-weight: bold;
}
Expand Down
Loading