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

Design: a pull's merge box uses §5's card and buttons, and the merge-* classes leave §5d #4378

Parked opened this
Closed without merging

The fix is committed on the branch but not pushed. git push fails because origin points at http://localhost:8080/trevato/forge.git and the sandbox can't reach that port. I tried twice, five seconds apart.

Notes

stopped parked by the crew deploy 9b284fd

opened this

The fix is committed on the branch but not pushed. git push fails because origin points at http://localhost:8080/trevato/forge.git and the sandbox can't reach that port. I tried twice, five seconds apart. Git config is read-only here and I wasn't given another push route, so I'm leaving it for a person to push or re-run.

Cause of the red check: the earlier work on this branch was already done: the merge box drawn from §5's card and buttons, the merge-* rules gone from the stylesheet, and tests asserting the old class names are absent. What failed was docs/DESIGN.md, which had a conflict block (<<<<<<< … >>>>>>> origin/main) committed into its §5d style/content.ts bullet. Design-lint also named .connect-more, .connect-path, .handoff and .handoff-links, which main had already removed from the stylesheet.

What I changed:

  • Resolved the conflict in docs/DESIGN.md in favour of the side without .merge-box, .merge-form, .merge-headline and .merge-sub.
  • Struck those four other classes from the same bullet.

Checks I ran:

  • bun scripts/design-lint.ts passes.
  • bun x tsc --noEmit is clean after bun install.
  • test/pulls.test.ts and the design tests pass.
  • Across test/web* and test/studio*, 497 pass and 1 fails: the empty-state check on /alice/blank/map expects "No issues to map yet." and doesn't find it. I didn't run it on main, and it isn't connected to the merge box (I didn't touch the map page).

Not done:

  • The before/after screenshots in light and dark, at desktop and 390 px, that the issue asks for. I can't reach a preview from here to take them.

To try it: open any pull page, the browse view of a pull, or the studio change page. The Ship form posts the same fields as before.

Closes #3867

commented

The fix is committed on the branch but not pushed. git push fails because origin points at http://localhost:8080/trevato/forge.git and the sandbox can't reach that port. I tried twice, five seconds apart. Git config is read-only here and I wasn't given another push route, so I'm leaving it for a person to push or re-run.

Cause of the red check: the earlier work on this branch was already done: the merge box drawn from §5's card and buttons, the merge-* rules gone from the stylesheet, and tests asserting the old class names are absent. What failed was docs/DESIGN.md, which had a conflict block (<<<<<<< … >>>>>>> origin/main) committed into its §5d style/content.ts bullet. Design-lint also named .connect-more, .connect-path, .handoff and .handoff-links, which main had already removed from the stylesheet.

What I changed:

  • Resolved the conflict in docs/DESIGN.md in favour of the side without .merge-box, .merge-form, .merge-headline and .merge-sub.
  • Struck those four other classes from the same bullet.

Checks I ran:

  • bun scripts/design-lint.ts passes.
  • bun x tsc --noEmit is clean after bun install.
  • test/pulls.test.ts and the design tests pass.
  • Across test/web* and test/studio*, 497 pass and 1 fails: the empty-state check on /alice/blank/map expects "No issues to map yet." and doesn't find it. I didn't run it on main, and it isn't connected to the merge box (I didn't touch the map page).

Not done:

  • The before/after screenshots in light and dark, at desktop and 390 px, that the issue asks for. I can't reach a preview from here to take them.

To try it: open any pull page, the browse view of a pull, or the studio change page. The Ship form posts the same fields as before.

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