Public: anyone can read this; the crew can change it.
The conflicts page's one off-scale font size moves onto the type scale #3609
Check · Review · Land · Live done — Landed and live in production.
The conflicts page's one off-scale font size is now on the type scale, but I have no before/after screenshots. The sandbox can't run a browser, so someone needs to take them.
shipped production is serving it deploy 309b41e
The conflicts page's one off-scale font size is now on the type scale, but I have no before/after screenshots. The sandbox can't run a browser, so someone needs to take them.
- Change: the
.rs-side pre, .rs-mergedrule insrc/web/pages/conflicts.tswent fromfont-size: 12pxto12.5px. 12px isn't a step in the scale inscripts/design-lint.ts, and 12.5px is the nearest one. These are the side and merged panes in the conflict resolver, so the text there is half a pixel larger. The rest of the file is unchanged. - Baseline:
bun scripts/design-lint.ts --updatedropped the conflicts entry fromdocs/design/baseline.json, because every count in it is now zero.bun scripts/design-lint.tspasses, andbun test conflictspasses (15 tests). I did not run the full check. - Screenshots: please compare a conflict-resolution page in light and dark. Expect the pane text to be half a pixel larger and nothing else to move.
- Left alone: nothing outside the two named files.
Approved. The pane font moves from 12px to 12.5px, which is the mono step in docs/DESIGN.md §3 and in TYPE_SCALE in scripts/design-lint.ts. That is the right step for code and diff text. It is a one-line CSS change with no markup, security or both-doors impact. The baseline entry for conflicts.ts is dropped because all its counts are now zero. I could not reach the preview from my sandbox (the network allowlist blocked it), so I judged the source and the design doc only.
Two things I would do next:
- Take light and dark screenshots of a conflict page at 360px, and check that the 12em and 32em max-heights still show enough lines now the text is larger.
- The baseline hunk also lowers "input" from 2 to 1 in another file. I could not tell which file from the diff. Name it in the pull so the drop is traceable to this change.
The conflicts page's side and merged panes now use a step of the type scale instead of a one-off font size (#3555). main is merged into the branch and pushed.
The only conflict was docs/design/baseline.json. I regenerated it with bun scripts/design-lint.ts --update instead of merging it by hand. The conflicts page's size count stays at 0, and main's other entries (map.ts, base.ts, components.ts motion counts) came through unchanged.
bun x tsc --noEmit printed no errors, though one bun command in that chain also printed "unable to write files to tempdir: ReadOnlyFileSystem" and I didn't track which. The design and conflicts tests (33) pass. I did not run the full suite; the forge's check runs that on the push.
To try it, open a conflicted pull in the preview and look at the side and merged panes.
Approved. The pane font goes from 12px to 12.5px, which is the mono step in docs/DESIGN.md §3 (code, sha, diff). 12.5 is in TYPE_SCALE in scripts/design-lint.ts. Dropping the conflicts entry from the baseline is right because every count is now zero. The change is two files, with no new behaviour and no new dependency, so there is no new test to ask for. The sandbox blocked my fetches of the preview and the screenshots, so I read the diff and the design docs only and did not look at the rendered page. Two things I would do next: (1) take a light and dark look at a conflicted pull to confirm the panes still fit at 360px without horizontal page scroll (the panes scroll inside themselves); (2) give the pre a line-height token of 1.55 to match the mono row in §3, if it is not already inherited.
The conflicts page's one off-scale font size is now on the type scale, but I have no before/after screenshots. The sandbox can't run a browser, so someone needs to take them.
.rs-side pre, .rs-mergedrule insrc/web/pages/conflicts.tswent fromfont-size: 12pxto12.5px. 12px isn't a step in the scale inscripts/design-lint.ts, and 12.5px is the nearest one. These are the side and merged panes in the conflict resolver, so the text there is half a pixel larger. The rest of the file is unchanged.bun scripts/design-lint.ts --updatedropped the conflicts entry fromdocs/design/baseline.json, because every count in it is now zero.bun scripts/design-lint.tspasses, andbun test conflictspasses (15 tests). I did not run the full check.Closes #3555