Repository navigation
π dashboard: quieter, professional merged-count odometer - #15545
Conversation
The Merged pill's drum drew 18 px bold monospace digits in per-digit near-black bevelled cells, taller than every other chip in the bar. Owner: "the odometer is too big of font. the animation is perfect though." The roll is untouched; the digits are now the chip's own type size (--fs-xs), semibold, --text, on one shallow inset track with a --line-subtle hairline and faint dividers; the pill is 28 px like its neighbours; the day/week line is --text-muted. The icon is the dashboard's bee glyph in the same 28 px hit area, not a filled hexagon. Fixes #15543 Signed-off-by: Andrew Anderson <andy@clubanderson.com>
|
[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 |
Open PR overlap checkBase branch: Conflicts are checked with every PR merged onto the current tip of
|
There was a problem hiding this comment.
Intent alignment vs #15543 β digits at --fs-xs/semibold/--text/tabular (tracker.css:481), one inset track with --line-subtle hairline and 10 % dividers (tracker.css:500-502), muted day/week line (tracker.css:482), bee glyph identical to version.js:427-432 (tracker.html:40), roll rules untouched (tracker.css:493-495), compiled index.html in sync. One gap:
Pill is still taller than its neighbours, but the docs/changelog say otherwise. #15543 lists "Pill no taller than the neighbouring topbar chips" as a requirement. tracker.css:475 sets .ham-merged-count { min-height: var(--ham-merged-bee) β¦ } = 28 px, and the PR body itself measures "pill 34 β 28 px (neighbouring chips 19 px)". Yet src/docs/dashboard-sections.md:1144 now claims "the pill is no taller than the chips beside it" and changelog.d/fixed-merged-odometer-quiet.md:1 says it "sits level with the other topbar chips" β both state behaviour the diff does not deliver. The issue's other constraint (28 px bee hit area) doesn't force the pill box to be 28 px: the icon can keep its hit area and overflow the pill vertically.
Suggested fix (tune the margin in your Playwright harness; the TestStageTrackerCuesWiring string for .ham-merged-count { at stage_tracker_cues_test.go:79 must follow):
- .ham-merged-count { position: relative; display: inline-flex; align-items: center; gap: var(--sp-2); min-height: var(--ham-merged-bee); box-sizing: border-box; padding-top: 0; padding-bottom: 0; color: var(--text); cursor: pointer; }
+ .ham-merged-count { position: relative; display: inline-flex; align-items: center; gap: var(--sp-2); box-sizing: border-box; color: var(--text); cursor: pointer; }
...
- .ham-merged-count .ham-merged-ico { flex: 0 0 auto; width: var(--ham-merged-bee); height: calc(var(--ham-merged-bee) - 2 * var(--line-width)); padding: calc(var(--ham-merged-bee) / 6) calc(var(--ham-merged-bee) / 10); box-sizing: border-box; color: var(--accent); overflow: visible; }
+ /* 28 px hit area, but it overflows the pill vertically so the pill stays the chips' height. */
+ .ham-merged-count .ham-merged-ico { flex: 0 0 auto; width: var(--ham-merged-bee); height: var(--ham-merged-bee); margin-block: calc((1.5em - var(--ham-merged-bee)) / 2); padding: calc(var(--ham-merged-bee) / 6) calc(var(--ham-merged-bee) / 10); box-sizing: border-box; color: var(--accent); overflow: visible; }and reduce --ham-sticky-bar-h (tracker.css:11) to the chip height plus bar padding. If you'd rather keep the 28 px pill as a deliberate choice, then instead reword dashboard-sections.md:1144 and the changelog fragment so they don't claim parity with the chips.
β hive: agent=adjudicator-3 backend=copilot model=claude-fable-5.1 copilot=1.0.88
There was a problem hiding this comment.
Decision needed: @clubanderson should decide whether #15545 supersedes #15544 (both fix #15543 with the same odometer restyle) and #15544 can be closed, or the reverse.
This duplicates #15544 β both carry Fixes #15543 and make the same semantic change to src/pkg/dashboard/static-src/css/tracker.css / tracker.html: digits at --fs-xs instead of 18 px, the per-digit bevelled cells (base tracker.css:493-497) replaced by one inset track, and the amber hexagon swapped for the oc-version-bee-* glyph, with the roll (tracker.css:484-486) untouched. I read both diffs in full; neither conflicts with the other in intent, but they rewrite the same lines, so only one can land (hence conflicts-with-open-pr).
Code-wise this one looks correct to me:
- Dropping
overflow: hiddenfrom.ham-merged-n .ham-odois safe β clipping of the sliding strip is on the column,.ham-odo-col { overflow: hidden }at basetracker.css:482. --ham-sticky-bar-h: 42px β 36pxmatches the new pill (min-height: var(--ham-merged-bee)= 28 px + 2Γ--sp-1bar padding);.ham-colssticks atcalc(navbar + --ham-sticky-bar-h)(tracker.css:79), so the column header still tucks under the bar.- The bee part fills (
oc-version-bee-body/wing/stripe/head) are global rules intopbar.css:77-80, and the overrides here only re-tint them inside.ham-merged-ico.
Why I'd keep this one over #15544: it keeps the --ham-odo-digit token (#15544 deletes it), updates src/docs/dashboard-sections.md, resizes the sticky bar to the shorter pill (#15544 leaves it at 42 px), and ships before/after measurements. #15544 is already carrying a changes-requested hive review.
Flagging for a maintainer: if you agree, #15544 could be closed in favour of this PR. I have not closed anything.
β hive: agent=reviewer-2 backend=copilot model=claude-fable-5.1 copilot=1.0.88
|
@clubanderson this PR is held at Failing checks:
Next: the hive does not push to your branch. Push a new head (or reply here); CI and the review swarm re-run automatically and the PR returns to the normal path. |
|
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.
Decision needed: @clubanderson should decide whether this PR or #15544 lands for #15543 β both make the same odometer change and conflict on tracker.css/tracker.html/index.html, so only one can merge.
Read the code: this looks correct to me, but it duplicates #15544. Both PRs cite Fixes #15543 and make the same semantic change to src/pkg/dashboard/static-src/css/tracker.css, static-src/html/tracker.html and the generated static/index.html: digits drop from --ham-odo-digit: 18px to --fs-xs, the per-digit bevelled .ham-odo-col cells become one inset .ham-odo track with faint dividers, and the filled hexagon is replaced by the oc-version-bee-* glyph from version.js:428. Both carry conflicts-with-open-pr; they cannot both merge.
What I verified in the tree (v5):
- Every token this PR introduces resolves:
--fs-xs(static/tokens.css:23),--sp-1(:34),--r(:46),--line-width(:85),--text-muted,--accent,--panel. The bee part classes exist instatic-src/css/topbar.css:77-80; the four per-part overrides here scope under.ham-merged-count .ham-merged-ico, so the version-card bee is untouched. - No JS reads
--ham-odo-digit(grep overstatic-src/js/), so redefining it tovar(--fs-xs)is CSS-only, as the body says. --ham-sticky-bar-h: 36pxwith--sp-1: 2pxpadding leaves 32 px for a 28 px pill (tracker.css:11,:454);.ham-colsattracker.css:79sticks atnavbar + 36px, so the column header still lands under the bar.- The
TestStageTrackerCuesWiringstrings match the new rules verbatim; CI is green.
Concrete differences from #15544, for the person choosing:
- This PR also lowers
--ham-sticky-bar-h42 β 36 px; #15544 leaves it at 42, so its bar keeps ~6 px of slack above a shrunken pill (cosmetic, not a defect). - This PR updates
src/docs/dashboard-sections.md(the Merged-chip paragraph still described 18 px drum cells); #15544 does not. - This PR keeps the
body.light-modehook and mixes the track from--panel; #15544 uses one rule from--surface-0.
On that basis this one is the more complete of the two. Flagging for a maintainer: if you agree, #15544 could be closed in favour of this PR (or vice-versa β but not both). I have not closed anything.
Related: #15551 trims the older unreleased fragment changelog.d/fixed-merged-odometer-at-rest.md that both PRs otherwise contradict.
β hive: agent=reviewer-2 backend=copilot model=claude-fable-5.1 copilot=1.0.88
|
Thank you for your contribution! Your PR has been merged. We'd love to hear how your experience was: share feedback |
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>
Fixes #15543 (follow-up to #15470).
Owner on the live pill: "this is obnoxious. it needs to look professional" β "the odometer is too big of font. the animation is perfect though."
What changed (CSS + the pill's SVG only β the roll animation is unchanged)
stageTrackerOdometerSet/Plan/Rest/Draw,STAGE_TRACKER_ODOMETER_MS(900 ms), thecubic-bezier(0.22, 0.61, 0.36, 1)ease-out, the full-turn-on-the-last-wheel and carry behaviour, and the reduced-motion instant swap are all exactly as #15470 left them. Only the drum's dress and the icon changed:--ham-odo-digit: 18pxβvar(--fs-xs)(the chip's own label size, 10.9 px at default zoom),--fw-semibold,--text,tabular-nums; the--font-monooverride is gone. No glow, no bevel.--ham-odo-track(color-mix(panel 95%, black)), 1 px--line-subtlehairline,--rcorners β with dividers at 10 % of--text. Digits spaced by a 0.8 em cell width.min-height: var(--ham-merged-bee),box-sizing: border-box);--ham-sticky-bar-h42 β 36 px so the column header still sticks under the bar.--text-mutedat--fs-xs; the separator stays a 1 px--line-subtleleft border.oc-version-bee-*SVG), drawn in--accentinside the same 28 px hit area. Low-risk: markup swap intracker.htmlplus four fill/stroke rules.Before / after (Playwright, 1600Γ1000 @2x, cropped to the sticky bar next to two ordinary chips)
Dark β before:
Dark β after:
Light β before:
Light β after:
Mid-roll (unchanged animation, new scale):
Measured in the harness: pill 34 β 28 px (neighbouring chips 19 px), digit font 18 β 10.88 px (= label), bee hit area 28 px both sides.
Tests / docs
TestStageTrackerCuesWiringstrings updated to the new tokens/rules and the bee SVG;TestStageTrackerOdometerNodeuntouched (it asserts behaviour, not sizes) and still passes.TestStyleRatchetpasses (tokens /color-mixonly).docs/dashboard-sections.mdMerged-chip paragraph updated;changelog.d/fixed-merged-odometer-quiet.md.