| ... | @@ -1173,14 +1173,28 @@ export default function GitActionsControl({ | ... | @@ -1173,14 +1173,28 @@ export default function GitActionsControl({ |
| 1173 | </DialogTitle> | 1173 | </DialogTitle> |
| 1174 | <DialogDescription>{pendingDefaultBranchActionCopy?.description}</DialogDescription> | 1174 | <DialogDescription>{pendingDefaultBranchActionCopy?.description}</DialogDescription> |
| 1175 | </DialogHeader> | 1175 | </DialogHeader> |
| 1176 | <DialogFooter> | 1176 | <DialogFooter className="sm:flex-wrap sm:items-center"> |
| 1177 | <Button variant="outline" size="sm" onClick={() => setPendingDefaultBranchAction(null)}> | 1177 | <Button |
| | 1178 | className="w-full sm:mr-auto sm:w-auto" |
| | 1179 | variant="outline" |
| | 1180 | size="sm" |
| | 1181 | onClick={() => setPendingDefaultBranchAction(null)} |
| | 1182 | > |
| 1178 | Abort | 1183 | Abort |
| 1179 | </Button> | 1184 | </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 | > |
| 1181 | {pendingDefaultBranchActionCopy?.continueLabel ?? "Continue"} | 1191 | {pendingDefaultBranchActionCopy?.continueLabel ?? "Continue"} |
| 1182 | </Button> | 1192 | </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 | > |
| 1184 | Checkout feature branch & continue | 1198 | Checkout feature branch & continue |
| 1185 | </Button> | 1199 | </Button> |
| 1186 | </DialogFooter> | 1200 | </DialogFooter> |