From 71f40c9655fe5447279fb8d3e451174486cb5f78 Mon Sep 17 00:00:00 2001 From: Sameh Khamis Date: Wed, 18 Nov 2026 18:56:00 -0800 Subject: [PATCH] Keep phone and clean-view credits as they were, and lift narrow corners over the World Timeline The Cesium credit box's width cap and right-to-left placement apply from 1200px as before, and in the Omnibar layout at every width, so the phone shell, clean view, recording and scene playback keep their own layout. Narrower than 1120px the coordinates and the Tactical readout sit above the World Timeline while it shows. The scene format notes that a build from before `sonar` refuses a project that has it. Co-authored-by: Manjunath Paparaju --- docs/CURRENT-STATE.md | 4 +- docs/SCENE-DOCUMENT.md | 4 +- src/ui/hudSonarStyle.test.mjs | 38 ++++++++++++++++--- src/ui/styles/command-dock-trays.css | 56 ++++++++++++++++++++-------- src/ui/styles/omnibar-dock.css | 7 ++++ 5 files changed, 87 insertions(+), 22 deletions(-) diff --git a/docs/CURRENT-STATE.md b/docs/CURRENT-STATE.md index 9e3c37ab9b..721350646a 100644 --- a/docs/CURRENT-STATE.md +++ b/docs/CURRENT-STATE.md @@ -1192,7 +1192,9 @@ coordinates (and, right to left, the Tactical readout) stay 6px above it however many lines it wraps onto, and the dock and World Timeline rise when it is taller than their usual clearance. Narrower than 1120px the dock leaves no room between the corners, so the coordinates and the readout sit above -the dock. Cesium's credit box wraps at every width outside that layout too. +the dock, and above the World Timeline while it shows. Outside that layout +Cesium's credit box wraps from 1200px, as before; the phone shell, clean +view, recording and scene playback lay the line out themselves. 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. diff --git a/docs/SCENE-DOCUMENT.md b/docs/SCENE-DOCUMENT.md index 5670e11068..948062c8e0 100644 --- a/docs/SCENE-DOCUMENT.md +++ b/docs/SCENE-DOCUMENT.md @@ -59,7 +59,9 @@ Visual fields are `style`, `mapStack`, `styleParams`, `bloom`, `sharpen`, `hud`, HUD `sonar: true` is Sonar on beside a layout that cannot say it (Minimal); it is written only then, so Tactical with Sonar stays the variant `cyber` and a shot without Sonar has no `sonar`. A shot without it opens with Sonar on only -when its variant is `cyber`. +when its variant is `cyber`. A build from before `sonar` refuses a project +that has it, as it refuses any field it does not know; every other project +still opens there. The latter settings were written by Update Shot but previously lost during normalization; they now survive import and capture. Version-1/2 bloom without an explicit scale version uses the original inverted diff --git a/src/ui/hudSonarStyle.test.mjs b/src/ui/hudSonarStyle.test.mjs index 391eefa55b..0892e07480 100644 --- a/src/ui/hudSonarStyle.test.mjs +++ b/src/ui/hudSonarStyle.test.mjs @@ -542,10 +542,14 @@ test('the desktop bottom row: credits on the Power Up baseline, the dock lifted, const anchor = trays.match( /#cesium-credits \{\s*right: auto;\s*bottom: ([\d.]+)rem;\s*left: 1\.5rem;/, ); - // At every width: a long line wraps rather than running under the - // corner row. - const box = trays.match( - /\n#cesium-credits \.cesium-widget-credits \{\s*width: max-content;\s*max-width: calc\(100vw - 1\.5rem - ([\d.]+)rem\);\s*white-space: normal;/, + // From 1200px, and in the Omnibar layout at every width: a long line + // wraps rather than running under the corner row. + const box = trayWide.match( + /\n\s*#cesium-credits \.cesium-widget-credits \{\s*width: max-content;\s*max-width: calc\(100vw - 1\.5rem - ([\d.]+)rem\);\s*white-space: normal;/, + ); + assert.match( + trays, + /:has\(#command-dock > #gev-voice-control\)\s*\)\s*#cesium-credits\s*\.cesium-widget-credits \{\s*width: max-content;\s*max-width: calc\(100vw - 1\.5rem - 26rem\);/, ); return anchor && box && [null, anchor[1], box[1]]; })(), @@ -576,9 +580,16 @@ test('the desktop bottom row: credits on the Power Up baseline, the dock lifted, trayWide, /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;/, ); + // Its box hangs from the anchor's right edge there, and in the Omnibar + // layout at every width; never in clean view or recording, where the + // anchor stays on the left. + assert.match( + trayWide, + /body:not\(\.context-docked\):not\(\.ui-clean-view\):not\(\.recording-mode\)\s*#cesium-credits\s*\.cesium-widget-credits \{\s*right: 0;\s*left: auto;/, + ); assert.match( trays, - /html\[dir='rtl'\] #cesium-credits \.cesium-widget-credits \{\s*right: 0;\s*left: auto;/, + /html\[dir='rtl'\]\s*body:not\(\.mobile-shell\)[^{]*:not\(\.recording-mode\):not\(\.context-docked\)[^{]*#cesium-credits\s*\.cesium-widget-credits \{\s*right: 0;\s*left: auto;/, ); // There the readout clears the row under it, however many lines it wraps // onto (--credit-line-height). @@ -757,3 +768,20 @@ test('shared panel hooks affect only opted-in rail surfaces without overriding d /body:is\(\.ui-clean-view, \.recording-mode\)[^{]+\{[^}]*visibility: hidden !important;[^}]*pointer-events: none !important;/, ); }); + +test('narrow Omnibar corners clear the World Timeline over the dock', () => { + const css = read('./styles/omnibar-dock.css'); + const timeline = css.match( + /#world-timeline \{\s*bottom: calc\(var\(--omnibar-dock-bottom\) \+ (\d+)px\);/, + ); + const height = read('./styles/world-timeline.css').match( + /#world-timeline \{[^}]*\n {2}height: (\d+)px;/, + ); + const corners = css.match( + /&:has\(#world-timeline\) \{\s*--omnibar-coordinates-bottom: max\(\s*calc\(var\(--omnibar-dock-bottom\) \+ (\d+)px \+ (\d+)px \+ (\d+)px\)/, + ); + assert.ok(timeline && height && corners); + assert.equal(Number(corners[1]), Number(timeline[1])); + assert.equal(Number(corners[2]), Number(height[1])); + assert.ok(Number(corners[3]) >= 6); +}); diff --git a/src/ui/styles/command-dock-trays.css b/src/ui/styles/command-dock-trays.css index c547cc448c..850f7f4e12 100644 --- a/src/ui/styles/command-dock-trays.css +++ b/src/ui/styles/command-dock-trays.css @@ -501,16 +501,13 @@ body:not(.ui-clean-view):not(.recording-mode):has( /* The coordinate readout shares the bottom-left corner with the attribution row below 1200px: it sits clear of the row's 28px logo line, with a 6px gap - (from 1200px, rail-split.css). At 980px and below the dock is two rows - tall and command-dock.css places it. */ -@media (min-width: 981px) { - #intel-hud:is([data-variant='tactical'], [data-variant='minimal']) - .hud-bottom-left, - :root[data-scope-mask='off'] - #intel-hud[data-variant='minimal'] - .hud-bottom-left { - bottom: calc(2vh + 7.125rem + var(--world-timeline-lift, 0px)); - } + (from 1200px, rail-split.css). */ +#intel-hud:is([data-variant='tactical'], [data-variant='minimal']) + .hud-bottom-left, +:root[data-scope-mask='off'] + #intel-hud[data-variant='minimal'] + .hud-bottom-left { + bottom: calc(2vh + 7.125rem + var(--world-timeline-lift, 0px)); } @media (max-width: 1199px) { @@ -532,21 +529,42 @@ body:not(.ui-clean-view):not(.recording-mode):has( } /* Cesium draws the line in an absolutely placed box inside the empty - #cesium-credits anchor, so the cap and the wrapping go on that box, at - every width: a long line wraps rather than running under the corner row. - Right to left it hangs from the anchor's right edge. */ -#cesium-credits .cesium-widget-credits { + #cesium-credits anchor, so the cap and the wrapping go on that box: from + 1200px, and in the Omnibar layout at every width, whose attribution row + shares the bottom edge with the corner row (omnibar-dock.css). */ +body:not(.mobile-shell):not(.cockpit-mode):not(.scene-playback-mode):not( + .ui-clean-view + ):not(.recording-mode):where( + :has(#gev-omnibar):has(#command-dock > #gev-voice-control) + ) + #cesium-credits + .cesium-widget-credits { width: max-content; max-width: calc(100vw - 1.5rem - 26rem); white-space: normal; } -html[dir='rtl'] #cesium-credits .cesium-widget-credits { +/* Right to left that layout puts the row at the bottom right at every + width, so the box hangs from the anchor's right edge. */ +html[dir='rtl'] + body:not(.mobile-shell):not(.cockpit-mode):not(.scene-playback-mode):not( + .ui-clean-view + ):not(.recording-mode):not(.context-docked):where( + :has(#gev-omnibar):has(#command-dock > #gev-voice-control) + ) + #cesium-credits + .cesium-widget-credits { right: 0; left: auto; } @media (min-width: 1200px) { + #cesium-credits .cesium-widget-credits { + width: max-content; + max-width: calc(100vw - 1.5rem - 26rem); + white-space: normal; + } + /* 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). */ @@ -564,6 +582,14 @@ html[dir='rtl'] #cesium-credits .cesium-widget-credits { left: auto; text-align: right; } + + html[dir='rtl'] + body:not(.context-docked):not(.ui-clean-view):not(.recording-mode) + #cesium-credits + .cesium-widget-credits { + right: 0; + left: auto; + } } @media (max-width: 900px) { diff --git a/src/ui/styles/omnibar-dock.css b/src/ui/styles/omnibar-dock.css index e60d5b5d4d..e9faafcdb2 100644 --- a/src/ui/styles/omnibar-dock.css +++ b/src/ui/styles/omnibar-dock.css @@ -368,6 +368,13 @@ body:not(.mobile-shell):not(.cockpit-mode):not(.scene-playback-mode):not( calc(var(--omnibar-dock-bottom) + 56px + 10px), var(--omnibar-credits-clear) ); + /* And above the World Timeline (42px tall) over the dock. */ + &:has(#world-timeline) { + --omnibar-coordinates-bottom: max( + calc(var(--omnibar-dock-bottom) + 66px + 42px + 10px), + var(--omnibar-credits-clear) + ); + } #intel-hud[data-variant='tactical'] .hud-bottom-right, &:where(html[dir='rtl'] *):not(.context-docked) #intel-hud[data-variant='tactical']