Repository navigation
Conversation
Open PR overlap checkBase branch: Conflicts are checked with every PR merged onto the current tip of No conflicting open PRs or same-file overlaps were found. |
There was a problem hiding this comment.
docs-currency β one in-scope finding.
Operator docs still describe the look this PR removes. src/docs/dashboard-sections.md:1144 (unchanged at f4c615c) says the bar "carries the hexagon bee (28 px; the pill grows to fit it)" and draws the count as "each digit in its own dark inset drum cell with a roller gradient, inner shadows top and bottom and a hairline between cells, monospace tabular digits at 18 px". The diff deletes exactly that: --ham-odo-digit, the per-cell gradient/inset-shadow rules and the light-mode drum (static-src/css/tracker.css old 490-497), the min-height that grew the pill (old 467), and the filled hexagon (static-src/html/tracker.html:40). #15543 asks for digits at --fs-xs, one subtle track, a pill no taller than neighbouring chips, and the dashboard bee glyph β the doc should say so, otherwise it contradicts the new changelog fragment in the same tree.
--- a/src/docs/dashboard-sections.md
+++ b/src/docs/dashboard-sections.md
@@ -1144 +1144 @@
-A thin bar at the top of the tracker β it stays pinned under the card header while the list scrolls, with the stage column header strip pinned just below it β carries the hexagon bee (28 px; the pill grows to fit it) with **Merged** and the all-time count drawn as a **mechanical odometer at rest, always** β each digit in its own dark inset drum cell with a roller gradient, inner shadows top and bottom and a hairline between cells, monospace tabular digits at 18 px, no thousands separator β every pull request
+A thin bar at the top of the tracker β it stays pinned under the card header while the list scrolls, with the stage column header strip pinned just below it β carries the dashboard bee glyph (the `oc-version-bee-*` shapes in a 28 px hit area; the pill stays the height of the neighbouring chips) with **Merged** and the all-time count drawn as a **quiet odometer at rest, always** β the wheels share one subtle inset track (1 px `--line-subtle` border, radius `--r`) with faint dividers between them, tabular digits at the chip label size (`--fs-xs`, weight 600), no thousands separator β every pull request(the rest of the paragraph is unchanged). :1150 ("the drum stays β the odometer look is the resting state") still holds and needs no edit.
Advisory, not blocking: changelog.d/fixed-merged-odometer-at-rest.md (same unreleased tree) still advertises "18 px tabular digits β¦ the pill grown to fit"; if both fragments ship in one release they contradict each other, so consider trimming that sentence or folding the two.
β hive: agent=ci-maintainer backend=copilot model=claude-fable-5.1 copilot=1.0.88
|
Hive filed review findings that do not block this PR as backlog items:
Cap: 10 backlog item(s) per PR per day. |
There was a problem hiding this comment.
Reviewed (intent-alignment) β diff satisfies #15543; one advisory, non-blocking.
- Digits at
--fs-xs/600/--text, single inset track (color-mix(... 96%, black), 1 px--line-subtle,--r), 15 % dividers, muted sub-line, light mode handled by the one rule βsrc/pkg/dashboard/static-src/css/tracker.css:461-463, 476-478. Roll mechanics untouched (tracker.css:467-473, base.ham-odo-colstill setsheight/overflow). Bee glyph classes resolve globally viatopbar.css:77-80.static/index.htmlregenerates clean (gen -checkexit 0) and every new substring instage_tracker_cues_test.go:75-82is present in the built asset. - Advisory: the pill still sits taller than the neighbouring
.ham-chips because the 28 px.ham-merged-ico(tracker.css:460) drives the button's content height, while.ham-chip(tracker.css:31) is--fs-xs+--sp-1padding (~24 px). The issue asks for both a 28 px bee hit area and "no taller than the neighbouring chips", so this is the spec's own tension; if you want the chip height to match, pull the icon out of the layout box:.ham-merged-count .ham-merged-ico { flex: 0 0 auto; width: var(--ham-merged-bee); height: var(--ham-merged-bee); margin-block: calc((1.25em - var(--ham-merged-bee)) / 2); }
β hive: agent=adjudicator-3 backend=copilot model=claude-fable-5.1 copilot=1.0.88
There was a problem hiding this comment.
Reviewed (style/conventions) β two low-severity notes; nothing blocking.
- Design token regressed to a literal. The three new border rules hard-code
1pxwhere the lines they replace usedvar(--line-width)(token defined atsrc/pkg/dashboard/static/tokens.css:85;.ham-chipitself atstatic-src/css/tracker.css:31and 29 other rules in this file use the token, vs 4 literals).static-src/css/tracker.css:462,:476,:478:
.ham-merged-count .ham-merged-sub { color: var(--text-muted); font-size: var(--fs-xs); font-variant-numeric: tabular-nums; padding-left: var(--sp-2); border-left: var(--line-width) solid var(--line-subtle); }
and likewise border: var(--line-width) solid var(--line-subtle) at :476 and border-left: var(--line-width) solid color-mix(...) at :478. Regenerate static/index.html after (make check at Makefile:13).
- Bee glyph is now duplicated by hand.
static-src/html/tracker.html:40inlines a copy of the five elements emitted byversionBeeGlyphHTML()(static-src/js/version.js:427-435), under a differentviewBox/translatewrapper. It renders correctly because the.oc-version-bee-*part rules atstatic-src/css/topbar.css:77-80are unscoped, but there is nothing tying the two copies together. At minimum add a cross-reference comment at both sites (<!-- keep in sync with versionBeeGlyphHTML() in version.js -->) so a future glyph tweak doesn't leave the Merged pill with a stale bee.
β hive: agent=adjudicator-4 backend=copilot model=claude-fable-5.1 copilot=1.0.88
|
@Karibhou this PR is back in your court ( Review asks:
Reply here or push a new head to this branch (same sign-off); CI and the review swarm re-run automatically and the PR returns to the normal path. Your relay could not take this as a |
|
stage 080-awaiting-merge-admission β 072-returned-to-contributor: conflicting |
Hive-Run: hivecommons#15543 Hive-Plan: quiet-merged-odometer Hive-Spec: issue-15543#dashboard-merged-count Co-authored-by: clubanderson <407614+clubanderson@users.noreply.github.com> Signed-off-by: Karibhou <157208370+Karibhou@users.noreply.github.com> # Conflicts: # src/pkg/dashboard/stage_tracker_cues_test.go # src/pkg/dashboard/static-src/css/tracker.css # src/pkg/dashboard/static-src/html/tracker.html # src/pkg/dashboard/static/index.html
f4c615c to
f0ac608
Compare
|
[APPROVALNOTIFIER] This PR is NOT APPROVED This pull-request has been approved by: The full list of commands accepted by this bot can be found here. DetailsNeeds approval from an approver in each of these files:Approvers can indicate their approval by writing |
There was a problem hiding this comment.
Decision needed: @clubanderson should decide whether #15544 can be closed as already delivered by #15545 (merged as 7724d4d, which also closed #15543).
This PR is a no-op against v5. compare/v5...f0ac608 reports ahead_by: 1, files: 0: the single commit f0ac608 resolved its conflicts to an empty tree change (its message still lists the four conflicted paths), so there is nothing left to merge. The odometer change it describes β chip-label sizing, shared track, bee glyph β already landed on v5 in 7724d4d (#15545, "quieter, professional merged-count odometer"), which touched static-src/css/tracker.css, static-src/html/tracker.html and static/index.html and carries Fixes #15543; #15543 is closed.
Flagging for a maintainer: if you agree, this one could be closed in favour of #15545. I have not closed anything.
β hive: agent=reviewer-2 backend=copilot model=claude-fable-5.1 copilot=1.0.88
There was a problem hiding this comment.
Decision needed: @clubanderson should decide whether #15544 can be closed as a no-op now that #15545 (merged) carries this change for #15543.
Conclusion: merging this PR would be a no-op against v5. Recommending closure in favour of #15545 β I have not closed anything.
Evidence (read from the repository, not the body):
- The head commit
f0ac608has a single parent,7724d4dβ which is the merge commit of #15545 (π dashboard: quieter, professional merged-count odometer). git diff --stat origin/v5...f0ac608is empty, andf0ac608^{tree}==7724d4d^{tree}(4ee88f9eβ¦): the commit carries no changes at all.- Both PRs cite
Fixes #15543. #15545 made the CSS/SVG change (src/pkg/dashboard/static-src/css/tracker.css,static/index.html,stage_tracker_cues_test.go) that this body describes.
So this is the same intent, already landed; there is no conflicting content to reconcile.
β hive: agent=reviewer backend=copilot model=claude-fable-5.1 copilot=1.0.88
|
Needs a decision, not a merge:
Head: verdict requires_human @f0ac608, 33/33 checks green, DCO yes, soak 16m0s of 30m0s. How to release it:
Clear the cause and the hive re-evaluates on its next pass; the stage moves to |
|
Needs a decision, not a merge:
Head: verdict requires_human @f0ac608, 33/33 checks green, DCO yes, soak 30m0s elapsed. How to release it:
Clear the cause and the hive re-evaluates on its next pass; the stage moves to |
|
The reviewed implementation has since landed in #15545, and this PR head has no content delta against that base. The maintainer decision requested in review remains open. β hive: backend=codex |
|
Needs a decision, not a merge:
Head: verdict requires_human @f0ac608, 33/33 checks green, DCO yes, soak 4m0s of 30m0s. How to release it:
Clear the cause and the hive re-evaluates on its next pass; the stage moves to |
|
Thank you for this PR. Superseded: #15543 was already fixed by merged PR #15545 (7724d4d), so there is nothing left for it to deliver and the hive is closing it as superseded. Your work is credited on the issue. Rationale: issue #15543 is closed and merged PR #15545 (7724d4d) closed it, so #15544 has nothing left to deliver; it is closed as superseded, not adopted (#15289). Closed by the hive as the owner's delegate (rule |
The already-landed close (#15671) only covered the hive's own PRs. #15544 by a trusted contributor was +0/β0 against v5 because #15545 (merged) carried the same change, yet it parked at 085 for 9h on the reviewer's "should decide whether #15544 can be closed as a no-op now that #15545 (merged) carries this change". - github: CloseAlreadyLandedHivePRIfEligible closes any author's PR when the diff is empty AND the landing is proven (named PR merged, linked issue closed by a merged PR, or head contained in base); comment "already landed via #N β closing as superseded; thank you @author". - automerge: the 085 route asks the already-landed closer for any author with an already-landed verdict; logs already-landed:<author_kind>. - review: "#N (merged)" names the landing PR like "via #N". - dashboard: the Let-hive-decide preview's why for an already-fixed close is the empty diff and the merged landing, never the author's trust. Closes #15732 Signed-off-by: Andrew Anderson <andy@clubanderson.com> Co-authored-by: hivecommons-hive[bot] <280983584+hivecommons-hive[bot]@users.noreply.github.com>
Changes
Reduce the merged-count odometer to the chip label size, replace the individual beveled cells with a subtle shared track, and use the dashboard bee glyph. The rolling animation and carry logic remain unchanged.
Fixes #15543
Validation
git diff --checkandgofmt -lpassed.β hive: backend=codex