authorgravatar for julius0216@outlook.comJulius Marminge <julius0216@outlook.com> 2026-09-10 11:34:56-07:00
committergravatar for noreply@github.comGitHub <noreply@github.com> 2026-09-10 11:34:56-07:00
logf814983c262b42bd79247bae377a709925c70d63
treee32c4e2a4b3bcacef704b45e9c5dd96f14668740
parent0527ddf06defc88169c245a0fe53635d41d66469
signature Signed by PGP key B5690EEEBB952194

fix(web): emphasize primary pull request actions (#11105)

1 files changed, 6 insertions(+), 12 deletions(-)

apps/web/src/components/pullRequest/PullRequestDetailPanel.tsx+6-12
...@@ -1728,7 +1728,7 @@ export function PullRequestDetailPanel({...@@ -1728,7 +1728,7 @@ export function PullRequestDetailPanel({
1728 <span className="inline-flex shrink-0">1728 <span className="inline-flex shrink-0">
1729 <Button1729 <Button
1730 size="xs"1730 size="xs"
1731 variant="ghost"1731 variant="default"
1732 disabled={handoff !== null}1732 disabled={handoff !== null}
1733 onClick={startResolveConflicts}1733 onClick={startResolveConflicts}
1734 aria-label={1734 aria-label={
...@@ -1754,15 +1754,12 @@ export function PullRequestDetailPanel({...@@ -1754,15 +1754,12 @@ export function PullRequestDetailPanel({
1754 <span className="inline-flex shrink-0">1754 <span className="inline-flex shrink-0">
1755 <Button1755 <Button
1756 size="xs"1756 size="xs"
1757 variant="ghost"1757 variant="default"
1758 disabled={actionPending}1758 disabled={actionPending}
1759 onClick={() => void perform("ready")}1759 onClick={() => void perform("ready")}
1760 aria-label="Ready for review"1760 aria-label="Ready for review"
1761 >1761 >
1762 <GitPullRequestIcon1762 <GitPullRequestIcon aria-hidden className="size-3.5" />
1763 aria-hidden
1764 className="hidden size-3.5 @max-[30rem]/pr-header:inline"
1765 />
1766 <span className="@max-[30rem]/pr-header:hidden">Ready for review</span>1763 <span className="@max-[30rem]/pr-header:hidden">Ready for review</span>
1767 </Button>1764 </Button>
1768 </span>1765 </span>
...@@ -1777,7 +1774,7 @@ export function PullRequestDetailPanel({...@@ -1777,7 +1774,7 @@ export function PullRequestDetailPanel({
1777 <span className="inline-flex shrink-0">1774 <span className="inline-flex shrink-0">
1778 <Button1775 <Button
1779 size="xs"1776 size="xs"
1780 variant="ghost"1777 variant="default"
1781 disabled={actionPending}1778 disabled={actionPending}
1782 onClick={() =>1779 onClick={() =>
1783 setConfirmation({ open: true, action: "enable-auto-merge" })1780 setConfirmation({ open: true, action: "enable-auto-merge" })
...@@ -1829,17 +1826,14 @@ export function PullRequestDetailPanel({...@@ -1829,17 +1826,14 @@ export function PullRequestDetailPanel({
1829 <span className="inline-flex shrink-0">1826 <span className="inline-flex shrink-0">
1830 <Button1827 <Button
1831 size="xs"1828 size="xs"
1832 variant="ghost"1829 variant="default"
1833 disabled={actionPending}1830 disabled={actionPending}
1834 onClick={() => setConfirmation({ open: true, action: "merge" })}1831 onClick={() => setConfirmation({ open: true, action: "merge" })}
1835 aria-label={1832 aria-label={
1836 pendingAction === "merge" ? "Merging..." : selectedMergeMethodLabel1833 pendingAction === "merge" ? "Merging..." : selectedMergeMethodLabel
1837 }1834 }
1838 >1835 >
1839 <GitMergeIcon1836 <GitMergeIcon aria-hidden className="size-3.5" />
1840 aria-hidden
1841 className="hidden size-3.5 @max-[30rem]/pr-header:inline"
1842 />
1843 <span className="@max-[30rem]/pr-header:hidden">1837 <span className="@max-[30rem]/pr-header:hidden">
1844 {pendingAction === "merge" ? "Merging..." : selectedMergeMethodLabel}1838 {pendingAction === "merge" ? "Merging..." : selectedMergeMethodLabel}
1845 </span>1839 </span>