Skip to content

Commit 5ac63d3

Browse files
authored
Merge branch 'pingdotgg:main' into main
2 parents 34a63e4 + 4ceabac commit 5ac63d3

1 file changed

Lines changed: 18 additions & 4 deletions

File tree

‎apps/web/src/components/GitActionsControl.tsx‎

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1173,14 +1173,28 @@ export default function GitActionsControl({
11731173
</DialogTitle>
11741174
<DialogDescription>{pendingDefaultBranchActionCopy?.description}</DialogDescription>
11751175
</DialogHeader>
1176-
<DialogFooter>
1177-
<Button variant="outline" size="sm" onClick={() => setPendingDefaultBranchAction(null)}>
1176+
<DialogFooter className="sm:flex-wrap sm:items-center">
1177+
<Button
1178+
className="w-full sm:mr-auto sm:w-auto"
1179+
variant="outline"
1180+
size="sm"
1181+
onClick={() => setPendingDefaultBranchAction(null)}
1182+
>
11781183
Abort
11791184
</Button>
1180-
<Button variant="outline" size="sm" onClick={continuePendingDefaultBranchAction}>
1185+
<Button
1186+
className="min-h-8 w-full max-w-full whitespace-normal py-1.5 leading-snug sm:min-h-7 sm:w-auto"
1187+
variant="outline"
1188+
size="sm"
1189+
onClick={continuePendingDefaultBranchAction}
1190+
>
11811191
{pendingDefaultBranchActionCopy?.continueLabel ?? "Continue"}
11821192
</Button>
1183-
<Button size="sm" onClick={checkoutFeatureBranchAndContinuePendingAction}>
1193+
<Button
1194+
className="min-h-8 w-full max-w-full whitespace-normal py-1.5 leading-snug sm:min-h-7 sm:w-auto"
1195+
size="sm"
1196+
onClick={checkoutFeatureBranchAndContinuePendingAction}
1197+
>
11841198
Checkout feature branch & continue
11851199
</Button>
11861200
</DialogFooter>

0 commit comments

Comments
 (0)