#250 was parked: taking all three of the parent's changes at once failed its check (pull #251, closed). The parent's three commits are independent, and two of them are worth taking separately. This is the small one.
The parent commit is a2e20b8 — "phone: the page never scrolls sideways; the pin is its place" — staged here at refs/following/main (a70d578). I applied it against this branch's HEAD in a scratch worktree: it cherry-picks clean, no conflicts, across src/web/layout.ts, src/web/scope.ts, src/web/style/base.ts, src/web/style/components.ts, src/web/style/content.ts and test/web-browse.test.ts (47 insertions, 31 deletions).
Done looks like:
[ ] a2e20b8 is taken onto this branch — git cherry-pick a2e20b8 (or a merge that brings only it) — with its own test change from test/web-browse.test.ts included.
[ ] The result is read, not just applied: the studio's chrome has moved a long way since the merge base (139 commits), so any rule the parent deletes from scope.ts is checked against the studio's pages before it goes.
[ ] A test asserts the property the commit is named for on a studio page at 360px — no element wider than the viewport, no horizontal scroll — so the behaviour is held here and not only upstream.
[ ] bun run check green, and bun x tsc --noEmit clean.
[ ] The pull says in one line what was taken and from which parent commit.
Files I expect to change: exactly the six the commit touches; nothing else.
Risks: src/web/scope.ts loses 13 lines upstream — that is the hunk to read closely, because this repository's studio styles lean on scope rules the parent does not have. If the deletion cannot be kept, keep the layout and style halves and say so in the pull.
This lands the shared half of #66 (the studio on a 360px phone), which should be built on top of it rather than beside it.
Whose brief fits: Scout — one contained take, one test, said plainly.
#250 was parked: taking all three of the parent's changes at once failed its check (pull #251, closed). The parent's three commits are independent, and two of them are worth taking separately. This is the small one.
The parent commit is
a2e20b8— "phone: the page never scrolls sideways; the pin is its place" — staged here atrefs/following/main(a70d578). I applied it against this branch's HEAD in a scratch worktree: it cherry-picks clean, no conflicts, acrosssrc/web/layout.ts,src/web/scope.ts,src/web/style/base.ts,src/web/style/components.ts,src/web/style/content.tsandtest/web-browse.test.ts(47 insertions, 31 deletions).Done looks like:
a2e20b8is taken onto this branch —git cherry-pick a2e20b8(or a merge that brings only it) — with its own test change fromtest/web-browse.test.tsincluded.scope.tsis checked against the studio's pages before it goes.bun run checkgreen, andbun x tsc --noEmitclean.Files I expect to change: exactly the six the commit touches; nothing else.
Risks:
src/web/scope.tsloses 13 lines upstream — that is the hunk to read closely, because this repository's studio styles lean on scope rules the parent does not have. If the deletion cannot be kept, keep the layout and style halves and say so in the pull.This lands the shared half of #66 (the studio on a 360px phone), which should be built on top of it rather than beside it.
Whose brief fits: Scout — one contained take, one test, said plainly.