Repository navigation
feat: rewrite DESIGN.md against D66 and ship the rendered reference (#36) #735
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
thomasluizon
merged 10 commits into
redesign/main
from
feature/ticket-36-design-spec-rewrite
Aug 15, 2026
Merged
Changes from 4 commits
Commits
Show all changes
10 commits
Select commit
Hold shift + click to select a range
b9ef378
feat: rewrite DESIGN.md against D66 and ship the rendered reference (…
thomasluizon 7598da2
feat: fold in the grant-1 decisions and add the hover canon (#36)
thomasluizon aea64fb
fix: hover that reads, no spill, and the three-scheme shortlist (#36)
thomasluizon 2fd8b22
feat: settle the fill, the hover speed and the spacing; three accents…
thomasluizon 5f3ae37
feat: unbind done from the accent, and render the brand in each candi…
thomasluizon ff91a94
fix: stop the reference page over-using the accent it is auditioning …
thomasluizon be0fae3
feat: render the rest of the kit, so the accent is judged where it la…
thomasluizon 8ec2b90
feat: discard emerald, narrow the accent to warm orange or rose (#36)
thomasluizon 1a644a9
fix: clear the Pullfrog review on 8ec2b90 (#36)
thomasluizon 69b5fc9
fix: delete the InfoCard accent tone rather than rationalise it (#36)
thomasluizon File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Some comments aren't visible on the classic Files Changed page.
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,68 @@ | ||
| name: Redesign drift control | ||
|
|
||
| # D36: the redesign lands on the long-lived `redesign/main` integration branch, not on | ||
| # `main`. That branch therefore drifts behind `main` every time anything else merges, | ||
| # and the drift is invisible until an R ticket hits a conflict weeks later. | ||
| # | ||
| # This job merges `main` into `redesign/main` on every push to `main`, so the | ||
| # integration branch is never more than one commit behind. It uses a real merge and | ||
| # never a rebase or a force push, because `redesign/main` is shared: every open R-ticket | ||
| # branch is cut from it, and rewriting its history would strand all of them. | ||
| # | ||
| # When the merge conflicts, the job fails loudly and stops. Resolving a conflict is a | ||
| # human decision about two real changes, and a machine picking a side silently is how a | ||
| # redesign quietly loses a fix that landed on main. | ||
|
|
||
| on: | ||
| push: | ||
| branches: [main] | ||
|
thomasluizon marked this conversation as resolved.
Resolved
|
||
| workflow_dispatch: | ||
|
|
||
| permissions: | ||
| contents: write | ||
|
|
||
| concurrency: | ||
| group: redesign-drift | ||
| cancel-in-progress: false | ||
|
|
||
| jobs: | ||
| merge-main-into-redesign: | ||
| runs-on: ubuntu-latest | ||
| steps: | ||
| - name: Check out the full history | ||
| uses: actions/checkout@v7 | ||
| with: | ||
| fetch-depth: 0 | ||
|
|
||
| - name: Skip when the integration branch does not exist | ||
| id: exists | ||
| run: | | ||
| if git ls-remote --exit-code --heads origin redesign/main >/dev/null 2>&1; then | ||
| echo "present=true" >> "$GITHUB_OUTPUT" | ||
| else | ||
| echo "present=false" >> "$GITHUB_OUTPUT" | ||
| echo "redesign/main does not exist yet; nothing to keep in sync." | ||
| fi | ||
|
|
||
| - name: Merge main into redesign/main | ||
| if: steps.exists.outputs.present == 'true' | ||
| run: | | ||
| set -euo pipefail | ||
| git config user.name "github-actions[bot]" | ||
| git config user.email "41898282+github-actions[bot]@users.noreply.github.com" | ||
|
|
||
| git switch redesign/main | ||
|
|
||
| if git merge-base --is-ancestor origin/main HEAD; then | ||
| echo "redesign/main already contains main. Nothing to do." | ||
| exit 0 | ||
| fi | ||
|
|
||
| if ! git merge --no-ff --no-edit origin/main; then | ||
| git merge --abort || true | ||
| echo "::error::main does not merge cleanly into redesign/main. Resolve it by hand; this job never picks a side." | ||
| exit 1 | ||
| fi | ||
|
|
||
| git push origin redesign/main | ||
| echo "Merged main into redesign/main." | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.