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

A diff's rows and tokens are named in docs/design/areas/diff.md, and .diff, .dl, .dn, .dh, .add, .del, .wd, .tok-inserted and .tok-deleted leave §5d #5927

Merged opened this

Check · Review · Land · Live done — Landed and live in production.

Merged

scout/forge:scout/5772-a-diff-s-rows-and-tokens-are-named-in-do → main 2 commits fork

  • Merged. scout/5772-a-diff-s-rows-and-tokens-are-named-in-do was merged into main as df21717.

Review

Sign in to review this change.
2 files changed +10 −12
docs/DESIGN.md −11
@@ -446,17 +446,6 @@ the same line (#4888).
446446 - `.slash`
447447 - `.sub`
448448 - `.tok`
449 - **`style/content.ts`, code view** — the source view and the syntax-highlight token classes `highlight-html.ts` builds as `tok-${kind}`:
450 - `.tok-deleted`
451 - `.tok-inserted`
452 - **`style/content.ts`, diff viewer** — the diff table: its gutters, line kinds, file head and inline review comments:
453 - `.add`
454 - `.del`
455 - `.dh`
456 - `.diff`
457 - `.dl`
458 - `.dn`
459 - `.wd`
460449 - **`style/content.ts`, apps, runs, and the crew** — run pages, their logs and checks (a pull's look is §5's **look**).
461450 - **`pages/board.ts`** — the board itself is §5's **board**; the spend tables `spend.ts` draws wear §5's `.table` and `.stack`, no class of their own
462451 - **`studio/feed_style.ts`** — the home feed's cards and its composer (the apps rail is §5's card, row and btn; an admin's tick boxes and Archive are always shown, deliberately, with no Select toggle):
docs/design/areas/diff.md +10 −1
@@ -2,7 +2,7 @@
22
33 The diff a pull and a commit show is one component, drawn by `renderDiff` in `src/web/diff-view.ts` and styled in
44 `src/web/style/content.ts`. It is a `.diff` wrapper holding a summary line and one §5 **diff file** (`.diff-file`) per
5 file; the line kinds and gutters (`.add`, `.del`, `.dh`, `.dl`, `.dn`, `.wd`) stay in §5d.
5 file.
66
77 - `.diff-summary` — the card above the files: how many files changed and the `+`/`−` totals, in their add and delete colours.
88 - `.diff-head` — a file's `<summary>` row: the fold chevron, path, status badge, line counts and the Viewed checkbox; sticky under the top bar, and wraps when its card is narrower than 420px.
@@ -14,3 +14,12 @@ file; the line kinds and gutters (`.add`, `.del`, `.dh`, `.dl`, `.dn`, `.wd`) st
1414 - `.diff-stub` — a `.diff-note` for a file too large or generated to draw: why, its real counts and a View file button.
1515 - `.dn-comment` — a line number in the gutter that links to commenting on that line, when the diff is reviewable.
1616 - `.nonl` — the `↵` mark after a line that has no newline at the end of the file.
17 - `.diff` — the wrapper around one whole diff: its summary and every file.
18 - `.dl` — one line of a hunk, a table row; its `data-k` says whether it is context, added or deleted.
19 - `.dn` — a line number in the gutter.
20 - `.dh` — a hunk head, the `@@` row that opens each hunk.
21 - `.add` — an added line, in the add colours.
22 - `.del` — a deleted line, in the delete colours.
23 - `.wd` — a changed word inside an added or deleted line, underlined on a stronger tint.
24 - `.tok-inserted` — an inserted token in highlighted code, in the add colour.
25 - `.tok-deleted` — a deleted token in highlighted code, in the delete colour.

↑↓ navigate ↵ open ⌘↵ its app esc close

Keyboard shortcuts

Docs