diff --git a/client/native-shell/main.ts b/client/native-shell/main.ts index bc9f12468..11fec72bd 100644 --- a/client/native-shell/main.ts +++ b/client/native-shell/main.ts @@ -26,8 +26,6 @@ const onPlay = Capacitor.getPlatform() === 'android'; const t = translator(locale); document.documentElement.lang = locale; document.documentElement.dir = directionOf(locale); -// For the few looks one web view draws differently from the other (shell.css). -document.documentElement.dataset.platform = Capacitor.getPlatform(); const root = document.getElementById('shell')!; const PROBE_TIMEOUT_MS = 8000; diff --git a/client/native-shell/shell.css b/client/native-shell/shell.css index 3402090a1..5cb174a84 100644 --- a/client/native-shell/shell.css +++ b/client/native-shell/shell.css @@ -103,6 +103,19 @@ /* The hairline the ambient grid is drawn in, and a travel-dusk wash for depth. */ --grid: rgba(255, 255, 255, 0.055); --wash-1: rgba(129, 140, 248, 0.12); + /* Mixes with transparent, spelled out per scheme: older Android web views (Chrome 113) + resolved color-mix() towards transparent as opaque and drew solid halos and rings. */ + --accent-ink-a16: rgba(9, 9, 11, 0.16); + --accent-ink-a35: rgba(9, 9, 11, 0.35); + --danger-a16: rgba(248, 113, 113, 0.16); + --ink-a22: rgba(250, 250, 250, 0.22); + --ink-a3: rgba(250, 250, 250, 0.03); + --ink-a4: rgba(250, 250, 250, 0.04); + --ink-a9: rgba(250, 250, 250, 0.09); + --ok-a16: rgba(74, 222, 128, 0.16); + --ok-a22: rgba(74, 222, 128, 0.22); + --wash-1-a85: rgba(129, 140, 248, 0.102); + --wash-1-a90: rgba(129, 140, 248, 0.108); --wash-2: rgba(244, 114, 182, 0.08); --veil-top: rgba(9, 9, 11, 0.4); --veil-mid: rgba(9, 9, 11, 0.72); @@ -135,6 +148,17 @@ --ok: #16a34a; --grid: rgba(17, 24, 39, 0.075); --wash-1: rgba(79, 70, 229, 0.1); + --accent-ink-a16: rgba(255, 255, 255, 0.16); + --accent-ink-a35: rgba(255, 255, 255, 0.35); + --danger-a16: rgba(220, 38, 38, 0.16); + --ink-a22: rgba(17, 24, 39, 0.22); + --ink-a3: rgba(17, 24, 39, 0.03); + --ink-a4: rgba(17, 24, 39, 0.04); + --ink-a9: rgba(17, 24, 39, 0.09); + --ok-a16: rgba(22, 163, 74, 0.16); + --ok-a22: rgba(22, 163, 74, 0.22); + --wash-1-a85: rgba(79, 70, 229, 0.085); + --wash-1-a90: rgba(79, 70, 229, 0.09); --wash-2: rgba(219, 39, 119, 0.07); --veil-top: rgba(255, 255, 255, 0.12); --veil-mid: rgba(255, 255, 255, 0.74); @@ -398,23 +422,18 @@ body::after { height: 80px; margin-bottom: 20px; animation: floaty 6s ease-in-out infinite; - filter: drop-shadow(0 14px 36px color-mix(in srgb, var(--wash-1) 90%, transparent)) - drop-shadow(0 6px 16px color-mix(in srgb, var(--ink) 22%, transparent)); + filter: drop-shadow(0 14px 36px var(--wash-1-a90)) + drop-shadow(0 6px 16px var(--ink-a22)); } /* The full TREK wordmark on the welcome screen, in the variant that reads on the scheme. */ .hero-logo { display: block; margin-bottom: 22px; - filter: drop-shadow(0 14px 36px color-mix(in srgb, var(--wash-1) 90%, transparent)) - drop-shadow(0 6px 16px color-mix(in srgb, var(--ink) 22%, transparent)); + filter: drop-shadow(0 14px 36px var(--wash-1-a90)) + drop-shadow(0 6px 16px var(--ink-a22)); animation: logoRise 0.7s var(--ease) both; } -/* The Android web view draws the two shadows above as a dark halo round the mark; iOS keeps them. */ -:root[data-platform='android'] .hero-mark, -:root[data-platform='android'] .hero-logo { - filter: none; -} .hero-logo img { display: block; height: 62px; @@ -569,7 +588,7 @@ body::after { border-color: var(--edge); box-shadow: 0 1px 2px rgba(0, 0, 0, 0.22), - inset 0 0 0 1px color-mix(in srgb, var(--ink) 4%, transparent); + inset 0 0 0 1px var(--ink-a4); } .btn-ghost:active { background: var(--surface-2); @@ -694,7 +713,7 @@ a.linkbtn { outline: none; box-shadow: 0 1px 2px rgba(0, 0, 0, 0.18), - inset 0 1px 0 color-mix(in srgb, var(--ink) 4%, transparent); + inset 0 1px 0 var(--ink-a4); transition: border-color 0.2s, box-shadow 0.25s; @@ -706,11 +725,11 @@ a.linkbtn { } .field input:focus { border-color: var(--edge-strong); - box-shadow: 0 0 0 4px color-mix(in srgb, var(--ink) 9%, transparent); + box-shadow: 0 0 0 4px var(--ink-a9); } .field.bad input { border-color: var(--danger); - box-shadow: 0 0 0 4px color-mix(in srgb, var(--danger) 16%, transparent); + box-shadow: 0 0 0 4px var(--danger-a16); animation: shake 0.3s; } @keyframes shake { @@ -738,7 +757,7 @@ a.linkbtn { .spinner { width: 18px; height: 18px; - border: 2px solid color-mix(in srgb, var(--accent-ink) 35%, transparent); + border: 2px solid var(--accent-ink-a35); border-top-color: var(--accent-ink); border-radius: 50%; animation: spin 0.7s linear infinite; @@ -793,7 +812,7 @@ a.linkbtn { width: 72px; height: 72px; border-radius: 50%; - background: color-mix(in srgb, var(--ok) 16%, transparent); + background: var(--ok-a16); display: grid; place-items: center; margin-bottom: 8px; @@ -894,11 +913,11 @@ a.linkbtn { font-weight: 600; padding: 1px 6px; border-radius: 999px; - background: color-mix(in srgb, var(--ok) 22%, transparent); + background: var(--ok-a22); color: var(--ok); } .segmented button[aria-pressed='true'] .save { - background: color-mix(in srgb, var(--accent-ink) 16%, transparent); + background: var(--accent-ink-a16); color: var(--accent-ink); } @@ -914,7 +933,7 @@ a.linkbtn { background: var(--surface); box-shadow: 0 2px 10px -4px rgba(0, 0, 0, 0.3), - inset 0 0 0 1px color-mix(in srgb, var(--ink) 3%, transparent); + inset 0 0 0 1px var(--ink-a3); transition: border-color 0.2s, box-shadow 0.2s, @@ -922,7 +941,7 @@ a.linkbtn { } .plan.featured { box-shadow: - 0 10px 30px -10px color-mix(in srgb, var(--wash-1) 85%, transparent), + 0 10px 30px -10px var(--wash-1-a85), 0 2px 8px -3px rgba(0, 0, 0, 0.35); } .plan:active { @@ -1030,7 +1049,7 @@ a.linkbtn { background: var(--surface); box-shadow: 0 1px 2px rgba(0, 0, 0, 0.18), - inset 0 1px 0 color-mix(in srgb, var(--ink) 4%, transparent); + inset 0 1px 0 var(--ink-a4); transition: border-color 0.2s, box-shadow 0.25s; @@ -1051,11 +1070,11 @@ a.linkbtn { } .slug-field:focus-within { border-color: var(--edge-strong); - box-shadow: 0 0 0 4px color-mix(in srgb, var(--ink) 9%, transparent); + box-shadow: 0 0 0 4px var(--ink-a9); } .slug-field.bad { border-color: var(--danger); - box-shadow: 0 0 0 4px color-mix(in srgb, var(--danger) 16%, transparent); + box-shadow: 0 0 0 4px var(--danger-a16); animation: shake 0.3s; } .slug-suffix {