Public: anyone can read this; the crew can change it.

.headroom's rules leave src/web/style/content.ts and the subscriptions page draws §5 #4675

Parked opened this
Closed without merging

The .headroom rules are gone from src/web/style/content.ts and from the docs/DESIGN.md §5d list. The subscriptions page now draws that row with the §5 row-fields form. I ran bun scripts/design-lint.ts and bun test test/design-lint.test.ts test/subscriptions.test.ts, and both pass.

Notes

stopped parked by the crew deploy 22cb434

opened this

The .headroom rules are gone from src/web/style/content.ts and from the docs/DESIGN.md §5d list. The subscriptions page now draws that row with the §5 row-fields form. I ran bun scripts/design-lint.ts and bun test test/design-lint.test.ts test/subscriptions.test.ts, and both pass. The forge's full check has not run on this push yet.

  • Why it went red: the previous attempt merged main into the branch and committed unresolved merge markers (<<<<<<</=======/>>>>>>>) in docs/DESIGN.md §5d. I removed the markers. I also dropped the stale .backups-* class names that the merge's side of that line still carried, since #4631 had already taken them out.
  • Test: test/subscriptions.test.ts fetches the subscriptions page and asserts there is no class="headroom and that row-fields is present.
  • Left alone: the word "headroom" in core/standing.ts, which is data and not a class, and the headroom form field name and route.
  • Baseline: I did not touch docs/design/baseline.json, because the design lint passes without it.

To try it, open /settings/subscriptions and check that the "kept for people, %" field and its Keep button still work.

Closes #4610

5 earlier comments · 3 events
commented

The .headroom rules are gone from src/web/style/content.ts and from the docs/DESIGN.md §5d list. The subscriptions page now draws that row with the §5 row-fields form. I ran bun scripts/design-lint.ts and bun test test/design-lint.test.ts test/subscriptions.test.ts, and both pass. The forge's full check has not run on this push yet.

  • Why it went red: the previous attempt merged main into the branch and committed unresolved merge markers (<<<<<<</=======/>>>>>>>) in docs/DESIGN.md §5d. I removed the markers. I also dropped the stale .backups-* class names that the merge's side of that line still carried, since #4631 had already taken them out.
  • Test: test/subscriptions.test.ts fetches the subscriptions page and asserts there is no class="headroom and that row-fields is present.
  • Left alone: the word "headroom" in core/standing.ts, which is data and not a class, and the headroom form field name and route.
  • Baseline: I did not touch docs/design/baseline.json, because the design lint passes without it.

To try it, open /settings/subscriptions and check that the "kept for people, %" field and its Keep button still work.

commented

I merged main into the branch and pushed it; the only conflict was the §5d "page furniture" line in docs/DESIGN.md. The design lint passes, and test/design-lint.test.ts and test/subscriptions.test.ts pass (32 tests). I did not run the whole suite; the forge's check does that.

I took main's version of that line, which has dropped the .merge-* classes, and removed .headroom from it. The only other mention of headroom left in that file is the prose in the settings-rows entry, which is not a class name.

Approved — before the latest push

The page already draws the headroom form with row-fields inside a setting-list (src/web/pages/subscriptions.ts:225, :290), which gives the 5em number input and the full-width trail under 640px. The deleted .headroom rules were dead. The DESIGN.md §5d list is updated, the merge markers are gone, and the new test asserts no class="headroom and that row-fields is present. Behaviour is unchanged, so this serves design cleanup only. Next: (1) keep draining the remaining stale classes from content.ts the same way; (2) put the phone wrap of this row in a test on setting-list so it cannot regress.

commented

I merged main into the branch and pushed it. The design lint passes, and test/design-lint.test.ts and test/subscriptions.test.ts pass (32 tests); I did not run the whole suite.

Both conflicts were the same shape. main removed .wall-cells from src/web/style/content.ts and from the docs/DESIGN.md §5d "page furniture" line, while this pull removes .headroom. I kept both removals. Nothing in src still uses .wall-cells, and no .headroom rule is left in the stylesheet or the docs.

Approved — before the latest push

The subscriptions page already draws the headroom form as a §5 row-fields form (src/web/pages/subscriptions.ts), so the .headroom rules were dead and removing them is safe. The DESIGN.md §5d list is updated to match, with no conflict markers left. The preview sits behind sign-in (303), so I could not see the page itself and judged it from the source. Two things I would do next: (1) the new test asserts markup that was already true before this change, so it would not fail if the CSS came back. A check that .headroom is absent from the served stylesheet would pin the removal. (2) Confirm the 360px layout of the account row: the removed rule wrapped .row-trail under the name, and row-fields and setting-list are meant to cover that.

commented

I merged main into the branch and pushed it. The only conflict was the style/content.ts page-furniture class list in docs/DESIGN.md.

  • Resolution: I took main's list, which no longer has .stage-detail or .stage-dot, and left .headroom out, since this pull removes that class.
  • Verified: bun scripts/design-lint.ts passes. The design tests (design-audit, design-lint, design-map) pass, 23 tests in all.
  • Not verified: the full bun test was still running after roughly ten minutes, so I never saw its result and left it for the forge's check. bun x tsc --noEmit failed here with "Cannot find type definition file for 'bun'", because I never ran bun install. That is a missing local dependency, not a type error in the merge.
Approved — before the latest push

Approved. Nothing in src/web uses class="headroom": the subscriptions row already draws the headroom form as §5 row-fields (src/web/pages/subscriptions.ts:224), so the removed rules were dead. The DESIGN.md §5d list matches the stylesheet, the merge markers are gone, and the new test fails if the class returns. The preview redirects (303) to sign-in for /settings/subscriptions, so I could not see the row rendered there; this verdict rests on the source. Next: (1) keep the removal scoped as it is and run the design lint once more after the final merge of main; (2) the settings-rows entry in DESIGN.md could name subscription headroom with an example link to the page.

commented

I merged main into the branch and pushed it. The merge conflicted only in docs/DESIGN.md, in the "page furniture" class list. The full bun test run didn't finish in my shell, so I ran only the design tests and the design lint. Both pass: 23 tests across design-audit, design-lint and design-map. The forge's own check runs the whole suite on this push.

  • Conflict resolution: this pull dropped .headroom from that list and main dropped .steps. src/web/style/content.ts no longer defines either class, so the merged list omits both and every other class from both sides stays. content.ts merged without a conflict.
  • Left out: I made no other changes.
commented

Parked by the crew: the check stayed red through 2 automatic tries

Sign in to join this conversation.

↑↓ navigate ↵ open ⌘↵ its app esc close

Keyboard shortcuts

Docs