From ea3d543e131df790c4ca0dacc581ae73b090e020 Mon Sep 17 00:00:00 2001 From: Sameh Khamis Date: Wed, 18 Nov 2026 13:32:05 -0800 Subject: [PATCH] Keep right-to-left credits clear of the corner row and the readout From review, checked in headless Chromium at 1100-1920px wide, Tactical and Minimal, left to right and right to left, with a credit line long enough to wrap: - Right to left with the Minimal HUD the credits stayed bottom left, under the language picker and Power Up: the Minimal placement's two IDs outweighed the right-to-left rule, which now matches it. - Right to left from 1200px a wrapped credit line ran into the Tactical bottom-right readout (AIS); the readout sits 1.5rem higher there. - The left rail no longer reads a top pin no stylesheet sets since Cyber went; VUE-MIGRATION no longer lists the removed cyberTheme test, and CURRENT-STATE notes the narrow-screen credit line that does not wrap (as on main). Co-authored-by: Manjunath Paparaju --- docs/CURRENT-STATE.md | 6 ++++-- docs/VUE-MIGRATION.md | 4 ++-- src/ui/hudSonarStyle.test.mjs | 10 ++++++++-- src/ui/leftPanelRail.js | 9 ++------- src/ui/styles/command-dock-trays.css | 7 +++++++ src/ui/styles/omnibar-dock.css | 9 +++++++++ src/ui/styles/rail-split.css | 6 ++++++ 7 files changed, 38 insertions(+), 13 deletions(-) diff --git a/docs/CURRENT-STATE.md b/docs/CURRENT-STATE.md index ec48047b6f..f96409cf09 100644 --- a/docs/CURRENT-STATE.md +++ b/docs/CURRENT-STATE.md @@ -1172,7 +1172,8 @@ Up baseline (bottom right when the page runs right to left, where the corner row moves to the bottom left). A credit line too long for the space before the corner row wraps upward instead of running under it. The Tactical bottom-right readout (GSD / ALT / AIS) sits 8px above the Power Up row and the Tactical and -Minimal coordinates start level with it. The World Timeline is 44rem narrower +Minimal coordinates start level with it; right to left, where the attribution +row is under it, the readout sits 1.5rem higher and clears two lines of it. The World Timeline is 44rem narrower than the screen there, so it sits between the corners and they stay put while it shows. Toasts keep 12px above the raised dock, and the chat and voice panel height budgets subtract its rise. Below 1200px the dock reaches the bottom @@ -1184,7 +1185,8 @@ readout also keeps 8px above the Power Up row. The left rail treats the centered World Timeline and voice control as obstacles only where they reach a laid-out panel, not the stack's transparent gutter. Known limit, unchanged from main: below 1200px with the World Timeline showing, the Tactical -bottom-right readout does not rise with the bar and can touch the dock. +bottom-right readout does not rise with the bar and can touch the dock, and a +credit line longer than the screen does not wrap. Wind appears in the Weather group before Audio. The surface-weather prototype uses keyless NOAA GFS or ECMWF IFS forecasts on an approximately 1° display grid. diff --git a/docs/VUE-MIGRATION.md b/docs/VUE-MIGRATION.md index ba65c38f4a..c2abe2253c 100644 --- a/docs/VUE-MIGRATION.md +++ b/docs/VUE-MIGRATION.md @@ -337,8 +337,8 @@ a feature supplying only its accent. records surface by surface; [Building UI](../CONTRIBUTING.md#building-ui) now requires the pattern for new UI. The page-level markup tests read `renderApplicationHtml()`, the real views rendered on the server, and new - tests mount components; three tests still read a `.vue` file's source - (`cyberTheme`, `panelStorageDocs`, `geoFileImport`). The views translate with `t()` + tests mount components; two tests still read a `.vue` file's source + (`panelStorageDocs`, `geoFileImport`). The views translate with `t()` while rendering, and vue-i18n holds the locale they read; the attribute translation pass is left for static page markup (the loading screen and a host's own markup). An explicit API for hosts to register panels and rail items is diff --git a/src/ui/hudSonarStyle.test.mjs b/src/ui/hudSonarStyle.test.mjs index 6230499b0b..75c7aaa6f9 100644 --- a/src/ui/hudSonarStyle.test.mjs +++ b/src/ui/hudSonarStyle.test.mjs @@ -484,15 +484,21 @@ test('the desktop bottom row: credits on the Power Up baseline, the dock lifted, `\\{\\s*bottom: calc\\(2vh \\+ 5rem \\+ ${lift}\\);\\s*width: auto !important;\\s*max-width: calc\\(100vw - 3rem\\);\\s*white-space: nowrap;`, ), ); - // Right to left the corner row is at the bottom left, so the row moves right. + // Right to left the corner row is at the bottom left, so the row moves + // right, with the Minimal HUD too (its placement names #intel-hud). assert.match( trayWide, - /html\[dir='rtl'\]\s*body:not\(\.context-docked\):not\(\.ui-clean-view\):not\(\.recording-mode\)\s*:is\(#cesium-credits, #gev-credits\) \{\s*right: 1\.5rem;\s*left: auto;/, + /html\[dir='rtl'\]\s*body:not\(\.context-docked\):not\(\.ui-clean-view\):not\(\.recording-mode\)\s*:is\(#cesium-credits, #gev-credits\),\s*html\[dir='rtl'\]\s*body:not\(\.context-docked\):not\(\.ui-clean-view\):not\(\.recording-mode\):has\(\s*#intel-hud\[data-variant='minimal'\]\.active\s*\)\s*:is\(#cesium-credits, #gev-credits\) \{\s*right: 1\.5rem;\s*left: auto;/, ); assert.match( trayWide, /#cesium-credits\s*\.cesium-widget-credits \{\s*right: 0;\s*left: auto;/, ); + // There the readout clears two lines of the row under it. + assert.match( + read('./styles/omnibar-dock.css'), + /html\[dir='rtl'\] \*\)\s*#intel-hud\[data-variant='tactical'\]\s*\.hud-bottom-right \{\s*bottom: calc\(3\.375rem \+ 1\.5rem\);/, + ); const locale = read('./styles/locale-picker.css'); assert.match(locale, /#corner-actions \{[^}]*inset-inline-end: 0\.9rem;/); diff --git a/src/ui/leftPanelRail.js b/src/ui/leftPanelRail.js index d714c18f86..2d3edda5e1 100644 --- a/src/ui/leftPanelRail.js +++ b/src/ui/leftPanelRail.js @@ -317,21 +317,16 @@ export function layoutLeftPanelRail({ stack.style.setProperty('--left-stack-safe-bottom', bottomValue); } // The rail stays where the resting stack puts it; only the panels move. - // A theme that pins the stack's top (Cyber) leaves nothing to offset. - const topPinned = - getComputedStyle(stack) - .getPropertyValue?.('--panel-stack-top-pinned') - ?.trim() === '1'; // The stack itself rises by the lift below, by a different amount for a // tall panel than at rest; the rail takes up the difference. const lift = (top) => Math.min(0, obstacleSafeTop - top); - const railOffset = `${(topPinned ? 0 : safeTop + lift(safeTop) - layoutTop - lift(layoutTop)).toFixed(1)}px`; + const railOffset = `${(safeTop + lift(safeTop) - layoutTop - lift(layoutTop)).toFixed(1)}px`; if (stack.style.getPropertyValue('--panel-rail-offset') !== railOffset) { stack.style.setProperty('--panel-rail-offset', railOffset); } // How far the column can rise before it meets the HUD readout, so the rail // and any open panel sit just under it, whether or not a panel is open. - const railLift = `${(topPinned ? 0 : lift(layoutTop)).toFixed(1)}px`; + const railLift = `${lift(layoutTop).toFixed(1)}px`; if (stack.style.getPropertyValue('--panel-rail-lift') !== railLift) { stack.style.setProperty('--panel-rail-lift', railLift); } diff --git a/src/ui/styles/command-dock-trays.css b/src/ui/styles/command-dock-trays.css index abb007bb52..eb20f444ad 100644 --- a/src/ui/styles/command-dock-trays.css +++ b/src/ui/styles/command-dock-trays.css @@ -540,8 +540,15 @@ body:not(.ui-clean-view):not(.recording-mode):has( /* Right to left, the corner row sits at the bottom left (locale-picker.css), so the attribution row takes the bottom right. Expanded Context places it itself (context-dock.css). */ + /* The Minimal HUD's placement above names #intel-hud too: matched here, + so right to left wins over it. */ html[dir='rtl'] body:not(.context-docked):not(.ui-clean-view):not(.recording-mode) + :is(#cesium-credits, #gev-credits), + html[dir='rtl'] + body:not(.context-docked):not(.ui-clean-view):not(.recording-mode):has( + #intel-hud[data-variant='minimal'].active + ) :is(#cesium-credits, #gev-credits) { right: 1.5rem; left: auto; diff --git a/src/ui/styles/omnibar-dock.css b/src/ui/styles/omnibar-dock.css index 9731640c73..480227e014 100644 --- a/src/ui/styles/omnibar-dock.css +++ b/src/ui/styles/omnibar-dock.css @@ -331,6 +331,15 @@ body:not(.mobile-shell):not(.cockpit-mode):not(.scene-playback-mode):not( #intel-hud[data-variant='tactical'] .hud-bottom-right { bottom: 3.375rem; } + /* Right to left the attribution row takes the bottom right: the readout + clears two lines of it (rail-split.css). */ + @media (min-width: 1200px) { + &:where(html[dir='rtl'] *) + #intel-hud[data-variant='tactical'] + .hud-bottom-right { + bottom: calc(3.375rem + 1.5rem); + } + } #intel-hud:is([data-variant='tactical'], [data-variant='minimal']) .hud-bottom-left { bottom: var(--omnibar-coordinates-bottom); diff --git a/src/ui/styles/rail-split.css b/src/ui/styles/rail-split.css index 6bb38f699b..e69b9213f8 100644 --- a/src/ui/styles/rail-split.css +++ b/src/ui/styles/rail-split.css @@ -127,6 +127,12 @@ bottom: 3.375rem; } + /* Right to left the attribution row takes the bottom right + (command-dock-trays.css): the readout clears two lines of it. */ + html[dir='rtl'] #intel-hud[data-variant='tactical'] .hud-bottom-right { + bottom: calc(3.375rem + 1.5rem); + } + #intel-hud:is([data-variant='tactical'], [data-variant='minimal']) .hud-bottom-left, :root[data-scope-mask='off']