amadan
Record which side is newer for each hunk Rastrillo and Fiesta differ in
hack/catch-up-1.2.md lists every hunk between Rastrillo main's ui/ and Fiesta 1.1.0 for tokens.css, shell.js, busy.js, transition.js, select.js, datetime.js and calendar.js, with the side that is newer and the Rastrillo commit. Rastrillo's newer hunks are the console rail's ring (cc7c9c69), skipped view transitions (d9c9ed13, 023740c5, e5e35a3e, 6b1c5478) and busy.js's data-live-form (8548e455); the rest are Fiesta's own.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
1 file changed,
+101
−0
hack/catch-up-1.2.md+101 −0
diff --git a/hack/catch-up-1.2.md b/hack/catch-up-1.2.md| new file mode 100644 |
| index 0000000..e28ccf4 |
| --- /dev/null |
| +++ b/hack/catch-up-1.2.md |
| @@ -0,0 +1,101 @@ |
| +# Catching up with Rastrillo for 1.2.0 |
| + |
| +Rastrillo is moving to take its stylesheets and scripts from Fiesta, so |
| +1.2.0 takes every change Rastrillo made to the shared files after |
| +Fiesta copied them. This is the record of each differing hunk, which |
| +side was newer, and what 1.2.0 does with it. |
| + |
| +Compared on 2026-11-04: Rastrillo main at aa35d581 (its `ui/`) against |
| +Fiesta main at bb23996 (1.1.0). Fiesta's scripts were seeded at |
| +e14b745a and its CSS and `select.js` synced at f892f8be |
| +(`hack/seed/README.md`), so a Rastrillo change after e14b745a to a |
| +script other than `select.js`, or after f892f8be to anything, is one |
| +Fiesta has not seen. |
| + |
| +## Identical on both sides |
| + |
| +`shell.css`, `themes/day.css`, `themes/plain.css`, `themes/signal.css`, |
| +`light.js` and `anchor.js`: no difference. |
| + |
| +## tokens.css: 11 hunks |
| + |
| +Rastrillo's `ui/tokens.css` is exactly Fiesta 1.0.0's `css/tokens.css` |
| +with cc7c9c69 applied (checked by applying the commit's diff to |
| +`git show v1.0.0:css/tokens.css` and comparing bytes). So one hunk is |
| +Rastrillo's and the other ten are Fiesta 1.1's additions. |
| + |
| +| Rastrillo lines | what differs | newer | 1.2.0 | |
| +|---|---|---|---| |
| +| 235 | the control icon scope gains seg-tabs buttons and side nav links | Fiesta 1.1 | keep | |
| +| 682 | the column's footer row, `rst-page-foot` | Fiesta 1.1 | keep | |
| +| 1342 | `rst-snippet` | Fiesta 1.1 | keep | |
| +| 1388 | `rst-status="inline"` on a phone | Fiesta 1.1 | keep | |
| +| 1644 | the footer row's flat menus in the summary-face rules | Fiesta 1.1 | keep | |
| +| 2089 | seg-tabs as buttons; `rst-side` and `rst-side-nav` | Fiesta 1.1 | keep | |
| +| 2923 | the console rail's nav: 5px padding given back by negative margins, a smaller sticky inset and a larger cap, so the current item's ring and shadow are not clipped | Rastrillo, cc7c9c69 | take | |
| +| 3377 | on a phone, seg-tabs buttons centre their label as the links do | Fiesta 1.1 | keep | |
| +| 3484 | forced colours: the current side nav link is marked as the shell's is | Fiesta 1.1 | keep | |
| +| 3525 | print: the current side nav link's wash | Fiesta 1.1 | keep | |
| +| 3627 | seg-tabs buttons and side nav links centred as rows | Fiesta 1.1 | keep | |
| + |
| +## shell.js: 4 hunks, all Rastrillo's |
| + |
| +Fiesta's `js/shell.js` is f892f8be's byte for byte. Rastrillo changed |
| +it in d9c9ed13, 023740c5, e5e35a3e and 6b1c5478 (skipped view |
| +transitions). Every hunk is taken: |
| + |
| +| Rastrillo lines | what differs | newer | 1.2.0 | |
| +|---|---|---|---| |
| +| 1 | the header's first line: transition observation and phone navigation | Rastrillo, e5e35a3e | take | |
| +| 29 | the header's loading note: sidebar and console load it deferred; other layouts load `transition.js` before the styles | Rastrillo, 023740c5, e5e35a3e | take | |
| +| 89 | `observeTransition`: swallow only a skipped transition's `AbortError`, `InvalidStateError` or `TimeoutError` on `ready`, `finished` and `updateCallbackDone`, once per transition; observe `document.activeViewTransition` at startup; the direction comment shortened | Rastrillo, d9c9ed13, 023740c5, 6b1c5478 | take | |
| +| 110, 129 | `reveal` and `leave` observe their event's transition | Rastrillo, d9c9ed13, 023740c5 | take | |
| + |
| +## busy.js: 3 hunks, all Rastrillo's |
| + |
| +Fiesta's `js/busy.js` is e14b745a's byte for byte; 8548e455 (live |
| +pages) changed it before the f892f8be sync, which took only the CSS |
| +and `select.js`. Every hunk is taken: |
| + |
| +| Rastrillo lines | what differs | newer | 1.2.0 | |
| +|---|---|---|---| |
| +| 28 | the header documents `data-live-form` | Rastrillo, 8548e455 | take | |
| +| 95 | `busySubmit(e, late)`: a `data-live-form` form is not armed in the capture listener | Rastrillo, 8548e455 | take | |
| +| 200 | the window listener arms a `data-live-form` form late, only if no live script claimed it (`e.liveForm`) and nobody cancelled it | Rastrillo, 8548e455 | take | |
| + |
| +The header's wording names `live.js`, Rastrillo's script. It stays as |
| +Rastrillo wrote it, so the bytes Rastrillo serves do not change; to |
| +Fiesta it is the attribute "set by a server that swaps forms" and |
| +harmless without one. |
| + |
| +## transition.js: Rastrillo only |
| + |
| +New in 023740c5 and finished in e5e35a3e and 6b1c5478: the small |
| +observer column, stage and topbar pages load before their styles. |
| +Taken whole, byte for byte, as an optional script. |
| + |
| +## select.js: 10 hunks, all Fiesta's |
| + |
| +Rastrillo has not changed `select.js` since f892f8be, when Fiesta |
| +synced it, so every difference is Fiesta's own: words read from the |
| +attribute, then the page's string table, then English (`fiestaWord`, |
| +`fiestaPickLang`); a disabled select, option group or fieldset locks |
| +the box; a form reset repaints it; the header's notes. Keep all. |
| + |
| +## datetime.js: 17 hunks, all Fiesta's |
| + |
| +Unchanged in Rastrillo since e14b745a. Every difference is Fiesta's: |
| +the string table lookup and the English date words; `fiestaCalendar` |
| +for `rastrilloCalendar`; a read-only or disabled field refuses edits; |
| +a reset no longer races a blur commit; the header's notes. Keep all. |
| + |
| +## calendar.js: 3 hunks, all Fiesta's |
| + |
| +`window.fiestaCalendar` for `window.rastrilloCalendar`, and two |
| +comments naming `check/node/datetime_node.mjs`. Keep all. |
| + |
| +## Out of scope |
| + |
| +`rastrillo.js` (its menu, switch, touch and scheme halves are already |
| +`fiesta.js`; its fragment shim stays Rastrillo's) and `live.js` (live |
| +pages stay Rastrillo's). |