Mirrors/stash
1
0
Fork 0
mirror of https://github.com/stashapp/stash.git synced 2025-12-18 21:04:37 +03:00
Code Issues Packages Projects Releases Wiki Activity

Revert modal button order change (#4400)

Browse Source
This commit is contained in:
WithoutPants
2023-12-28 13:56:05 +11:00
committed by GitHub
parent f32d60f208
commit 82cbeff9b5
1 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
ui/v2.5/src/components/Shared/Modal.tsx
View File

@@ -60,24 +60,6 @@ export const ModalComponent: React.FC<IModal> = ({
<div>{leftFooterButtons}</div> <div>{leftFooterButtons}</div>
<div> <div>
{footerButtons} {footerButtons}
<Button
disabled={isRunning || disabled}
variant={accept?.variant ?? "primary"}
onClick={accept?.onClick}
className="ml-2"
>
{isRunning ? (
<Spinner animation="border" role="status" size="sm" />
) : (
accept?.text ?? (
<FormattedMessage
id="actions.close"
defaultMessage="Close"
description="Closes the current modal."
/>
)
)}
</Button>
{cancel ? ( {cancel ? (
<Button <Button
disabled={isRunning} disabled={isRunning}
@@ -96,6 +78,24 @@ export const ModalComponent: React.FC<IModal> = ({
) : ( ) : (
"" ""
)} )}
<Button
disabled={isRunning || disabled}
variant={accept?.variant ?? "primary"}
onClick={accept?.onClick}
className="ml-2"
>
{isRunning ? (
<Spinner animation="border" role="status" size="sm" />
) : (
accept?.text ?? (
<FormattedMessage
id="actions.close"
defaultMessage="Close"
description="Closes the current modal."
/>
)
)}
</Button>
</div> </div>
</Modal.Footer> </Modal.Footer>
</Modal> </Modal>