Skip to content

Pull request: Align the merge box states, method menu and merge form with GitHub - #72

Merged
whereareiam merged 1 commit into
devfrom
fix/merge-box-blocked-state
Oct 4, 2026
Merged

whereareiam merged 1 commit into
devfrom
fix/merge-box-blocked-state

Conversation

@whereareiam

Copy link
Copy Markdown
Owner

What was wrong

Three merge box states on a pull request page were never covered by the earlier alignment work:

  • Blocked by branch protection (missing approvals, admin override): row text was pushed to the right edge and the merge bar overflowed the box.
  • Merge method menu: items had divider lines, a 42px label inside a 32px row, and uneven margins.
  • Expanded merge form: the form was 514px wide beside the instructions link, with 35px inputs and uneven button spacing.

What changed

Only styles/components/issues/pull_review.ts.

  • All merge box states share one layout: each row is a 16px-padded section with a top border and a 32px round status icon (red for a failed requirement); a row's control sits at its right edge.
  • The override merge button uses GitHub's danger button (red text on the default button background) instead of a filled red bar.
  • Menu rows: 32px, 6px 8px padding, no borders, 8px menu padding.
  • Expanded form: full width of the box, 32px title input, 16px row gap, 8px between buttons; the instructions link wraps below.
Before After
Menu item border 1px bottom none
Menu label height 42px in a 32px row 20px line in a 32px row
Dropdown trigger 38×32 32×32
Merge form width 514px full row (782px)
Title input height 35px 32px

Forgejo-only rows (signing key, admin override, auto-merge clock) are kept and restyled; wording is untouched.

Verification

Checked in the preview on mergeable, blocked (temporary branch protection with one required approval), draft, merged and closed pull requests, with the menu open and the form expanded. bun vitest (403 passed), bun check and Prettier pass. Screenshots are not attached.

🤖 Generated with Claude Code

…with GitHub

Every merge box state now uses one sectioned layout, so a pull request
blocked by branch protection no longer pushes its text to the right or
lets the merge bar overflow the box. The merge method menu drops its
divider lines and oversized rows, and the expanded merge form spans the
box with GitHub-sized inputs and buttons.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
@whereareiam whereareiam added the bug Something isn't working label Oct 4, 2026
@whereareiam
whereareiam merged commit e5aa8a2 into dev Oct 4, 2026
8 of 9 checks passed
@whereareiam
whereareiam deleted the fix/merge-box-blocked-state branch October 4, 2026 07:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

bug Something isn't working

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant