diff --git a/server/otter/static/app.js b/server/otter/static/app.js index f5b77a7..d499f32 100644 --- a/server/otter/static/app.js +++ b/server/otter/static/app.js @@ -1347,6 +1347,11 @@ function openInstallDialog(id) { } $("#install-btn").addEventListener("click", () => openInstallDialog()); +// ESP Web Tools opens its own dialog once the port is picked: ours is modal, so everything +// outside it, that dialog included, would be inert (#104). Step aside when the install starts. +$(".install-action", installDialog).addEventListener("click", (e) => { + if (e.target.closest("[slot=activate]")) installDialog.close(); +}); $("#install-fw").addEventListener("change", renderInstallButton); // --- Live logs (#96) --------------------------------------------------------- diff --git a/server/otter/static/style.css b/server/otter/static/style.css index dd11044..75accc4 100644 --- a/server/otter/static/style.css +++ b/server/otter/static/style.css @@ -33,6 +33,52 @@ } } +/* ESP Web Tools' dialogs (the web installer, Material 3 inside) in the dashboard's colors, + font and shapes, dark mode included. Their own defaults sit on :host, which a rule naming + the element overrides. */ +:root, ewt-install-dialog, ewt-no-port-picked-dialog { + --roboto-font: system-ui, -apple-system, "Segoe UI", sans-serif; + --md-ref-typeface-plain: system-ui, -apple-system, "Segoe UI", sans-serif; + --md-ref-typeface-brand: system-ui, -apple-system, "Segoe UI", sans-serif; + --md-sys-color-primary: var(--accent); + --md-sys-color-on-primary: var(--accent-text); + --md-sys-color-primary-container: color-mix(in srgb, var(--accent) 16%, var(--surface)); + --md-sys-color-on-primary-container: var(--text); + --md-sys-color-secondary-container: color-mix(in srgb, var(--accent) 12%, var(--surface)); + --md-sys-color-on-secondary-container: var(--text); + --md-sys-color-tertiary: var(--ok); + --md-sys-color-tertiary-container: color-mix(in srgb, var(--ok) 14%, var(--surface)); + --md-sys-color-surface: var(--bg); + --md-sys-color-surface-container-lowest: var(--surface); + --md-sys-color-surface-container-low: var(--surface); + --md-sys-color-surface-container: var(--surface); + --md-sys-color-surface-container-high: var(--bg); + --md-sys-color-surface-container-highest: var(--track); + --md-sys-color-on-surface: var(--text); + --md-sys-color-on-surface-variant: var(--muted); + --md-sys-color-outline: var(--border); + --md-sys-color-outline-variant: var(--border); + --md-sys-color-error: var(--err); + --md-sys-color-error-container: color-mix(in srgb, var(--err) 14%, var(--surface)); + --md-sys-color-on-error-container: var(--err); + --md-sys-color-scrim: rgb(10 14 20); + --md-sys-shape-corner-extra-large: 16px; + --md-sys-shape-corner-large: 12px; + --md-sys-shape-corner-medium: 10px; + --md-sys-shape-corner-small: 8px; + --md-sys-shape-corner-extra-small: 6px; + --md-filled-button-container-shape: 6px; + --md-filled-tonal-button-container-shape: 6px; + --md-outlined-button-container-shape: 6px; + --md-text-button-container-shape: 6px; + --md-dialog-container-color: var(--bg); + --md-dialog-container-shape: 16px; + --md-dialog-headline-color: var(--text); + --md-dialog-supporting-text-color: var(--text); + --text-color: var(--text); + --danger-color: var(--err); +} + * { box-sizing: border-box; } /* `hidden` must win over any display rule (e.g. grid cards). */ [hidden] { display: none !important; }