Skip to content

Land the judged redesign branch line: strips, content layer, 24-grid icons, dakit dea377c - #38

Merged
alexeygrigorev merged 9 commits into
mainfrom
family/land-1003
Oct 2, 2026
Merged

alexeygrigorev merged 9 commits into
mainfrom
family/land-1003

Conversation

@alexeygrigorev

Copy link
Copy Markdown
Member

Merges redesign/dataops-family (065247e, the continuously-judged line, 7 judge rounds recorded, latest PASS) into main (793a84c) so main becomes the superset. Merge commit: 849666f.

Branch commits carried (8 ahead of main)

  • 99f88dc segmented-strip recipe on detail/breakdown surfaces (colon-free .seg-fact, stat-link→stat-value)
  • 0808dbf test alignment with the strip recipe
  • 12983d7 content-layer tuning: strips, row links, mobile records, pill discipline
  • 3bd10ad phone controls at content width
  • d6fa542 independent 24-grid icon migration (same spec as main's)
  • 83e536c vendored dakit refresh to dea377c (family focus ring, input focus halo)
  • judge-record commits incl. 065247e round-7 PASS

Conflict resolutions

  • templates/base.html + dashboard.html (dual icon migrations: main db177d4 vs branch d6fa542): branch markup wins (judged line). Verified all 19 sidebar/shell SVGs are spec-compliant 24-grid: viewBox="0 0 24 24", rendered 20px, stroke-width="1.8", fill="none", round caps/joins. Zero viewBox="0 0 16 16" / stroke-width="1.5" anywhere in templates. Main's path-agnostic geometry-pinning test (test_chrome_icons_use_family_24grid_geometry) kept unchanged — it asserts attributes, not path data, and passes against the branch's icon set.
  • base.html Admin nav: the branch forked before cdf3a9a and still pointed Admin nav at /admin/ (Django admin) — and the branch never had the admin-API-keys feature at all. Restored main's "Admin API keys" nav entry (24-grid shield icon) pointing at mailing:admin_api_keys; the admin keys page/routes/PR Fix judge findings on the landed family redesign #33 fixes (stack-table + data-labels, banded panel, outlined .danger Revoke, no Django-admin link) survive untouched as main-only files.
  • static/mailing/css/app.css: branch wins wholesale. Their strip recipe (1px flex gaps, container paints the divider color, cells paint surface) renders interior hairlines and structurally cannot reproduce the opaque-cell overpaint PR Fix judge findings on the landed family redesign #33 fixed — that fix targeted the retired negative-margin-border recipe the branch replaced.
  • mailing/tests/test_operator_ui.py: exact union — branch's test alignment verbatim + main's icon-geometry test (the only delta vs the branch file).

Verification

  • uv run pytest: 755 passed (branch tip's count governs + main's geometry test)
  • uv run ruff check .: clean
  • retired-geometry greps over templates: clean

Client identity meta and campaign summaries render as single segmented strips, audience breakdowns and tag clouds become colon-free segment facts with status dots, the Mailchimp mappings section joins the panel pattern, and the audience select gets a placeholder label.
The family contract (dakit family.md, 71a39d3) renders icons as 24-viewBox
paths at 20px, stroke 1.8; the operator chrome still taught the retired
16-box, stroke-1.5 set. Redraw all twenty sidebar, toolbar, theme, and
action glyphs on the 24 grid: shared controls copy the sibling apps byte
for byte (dataqna's theme moon/sun, menu, sidebar chevrons, sliders; the
showcase chevron-down, x, doc, plus, clock), and relay-specific concepts
(grid, send, users, inbox, funnel, at-sign, briefcase, code, shield) move
to the same 24-grid drawing style so no app mixes the two sets.
…mily/land-1003

# Conflicts:
#	templates/base.html
#	templates/mailing/dashboard.html
@alexeygrigorev
alexeygrigorev merged commit 6d34abf into main Oct 2, 2026
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant