Skip to content

[pull] main from pingdotgg:main #283

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.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 2 commits into from
Sep 20, 2026
Merged

[pull] main from pingdotgg:main #283

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
599c977
fix(web): align pull request state glyph to top of row (#11268)
akash3444 Sep 20, 2026
7445aa7
fix(web): align menu item icons in pull request detail panel (#11263)
akash3444 Sep 20, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions apps/web/src/components/pullRequest/PullRequestDetailPanel.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1535,7 +1535,7 @@ export function PullRequestDetailPanel({
!detail && !onClose && "hidden",
)}
>
<div className="ml-4 grid h-7 min-w-0 items-center overflow-hidden">
<div className="pl-4 grid h-7 min-w-0 items-center overflow-hidden">
<div
aria-hidden={condensed}
inert={condensed}
Expand Down Expand Up @@ -1757,7 +1757,7 @@ export function PullRequestDetailPanel({
</Tooltip>
<MenuPopup align="end" side="bottom" className="min-w-72">
<MenuItem onClick={() => startCheckout("worktree")}>
<GitBranchIcon className="mt-0.5 size-3.5 shrink-0 self-start" />
<GitBranchIcon className="mt-1 size-3.5 shrink-0 self-start" />
<span className="flex min-w-0 flex-col">
<span>In a separate worktree</span>
<span className="text-xs text-muted-foreground">
Expand All @@ -1766,7 +1766,7 @@ export function PullRequestDetailPanel({
</span>
</MenuItem>
<MenuItem onClick={() => startCheckout("local")}>
<FolderGit2Icon className="mt-0.5 size-3.5 shrink-0 self-start" />
<FolderGit2Icon className="mt-1 size-3.5 shrink-0 self-start" />
<span className="flex min-w-0 flex-col">
<span>In this repository</span>
<span className="text-xs text-muted-foreground">
Expand Down Expand Up @@ -1982,7 +1982,7 @@ export function PullRequestDetailPanel({
Refresh
</MenuItem>
<MenuItem disabled={handoff !== null} onClick={askAboutPullRequest}>
<MessageCircleQuestionIcon className="mt-0.5 size-3.5 shrink-0 self-start" />
<MessageCircleQuestionIcon className="mt-1 size-3.5 shrink-0 self-start" />
<span className="flex min-w-0 flex-col">
<span>{handoff === "ask" ? "Opening..." : "Ask a question"}</span>
<span className="text-xs text-muted-foreground">
Expand All @@ -1993,7 +1993,7 @@ export function PullRequestDetailPanel({
</span>
</MenuItem>
<MenuItem disabled={handoff !== null} onClick={explainPullRequest}>
<BookOpenIcon className="mt-0.5 size-3.5 shrink-0 self-start" />
<BookOpenIcon className="mt-1 size-3.5 shrink-0 self-start" />
<span className="flex min-w-0 flex-col">
<span>{handoff === "explain" ? "Opening..." : "Explain this PR"}</span>
<span className="text-xs text-muted-foreground">
Expand Down
2 changes: 1 addition & 1 deletion apps/web/src/components/pullRequest/PullRequestRow.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ function PullRequestRowImpl({
{/* The conflict warning rides the corner of the lifecycle glyph, over the arrow's
merge circle, so the leading slot stays one icon wide and titles line up whether or
not a row is blocked. The background fill cuts it out of the glyph beneath. */}
<span className="relative inline-flex shrink-0">
<span className="relative inline-flex self-start mt-0.75 shrink-0">
<PullRequestStateGlyph state={entry.state} isDraft={entry.isDraft} />
{/* The wrapper takes the offset, not the icon, so the tooltip trigger inside keeps the
badge's size and anchors the popup to it. */}
Expand Down
Loading