diff --git a/src/components/cards/AddCardModal.svelte b/src/components/cards/AddCardModal.svelte index 078a07b6..c22def0f 100644 --- a/src/components/cards/AddCardModal.svelte +++ b/src/components/cards/AddCardModal.svelte @@ -180,7 +180,7 @@ modal_open = false; }} type="button" - class="w-full justify-center rounded-md border border-gray-300 shadow-sm px-4 py-2 bg-white text-base font-medium text-gray-700 hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-indigo-500 hidden lg:block" + class="cancel_modal_button" > {$_("cancel")} diff --git a/src/components/cards/CardDetailModal.svelte b/src/components/cards/CardDetailModal.svelte index f4954402..c5c34821 100644 --- a/src/components/cards/CardDetailModal.svelte +++ b/src/components/cards/CardDetailModal.svelte @@ -189,7 +189,7 @@ edit_modal_open = false; }} type="button" - class="w-full justify-center rounded-md border border-gray-300 shadow-sm px-4 py-2 bg-white text-base font-medium text-gray-700 hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-indigo-500 hidden lg:block" + class="cancel_modal_button" > {$_("cancel")} diff --git a/src/components/cards/DeleteCardModal.svelte b/src/components/cards/DeleteCardModal.svelte index 96a590f0..ea8c8521 100644 --- a/src/components/cards/DeleteCardModal.svelte +++ b/src/components/cards/DeleteCardModal.svelte @@ -103,7 +103,7 @@ @@ -112,7 +112,7 @@ modal_open = false; }} type="button" - class="w-full justify-center rounded-md border border-gray-300 shadow-sm px-4 py-2 bg-white text-base font-medium text-gray-700 hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-indigo-500 hidden lg:block" + class="cancel_modal_button" > {$_("cancel")} diff --git a/src/components/contacts/AddContactModal.svelte b/src/components/contacts/AddContactModal.svelte index 6e2be273..108f43d0 100644 --- a/src/components/contacts/AddContactModal.svelte +++ b/src/components/contacts/AddContactModal.svelte @@ -469,7 +469,7 @@ modal_open = false; }} type="button" - class="w-full justify-center rounded-md border border-gray-300 shadow-sm px-4 py-2 bg-white text-base font-medium text-gray-700 hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-indigo-500 hidden lg:block" + class="cancel_modal_button" > {$_("cancel")} diff --git a/src/components/donations/AddDonationPaymentModal.svelte b/src/components/donations/AddDonationPaymentModal.svelte index 34b02ec5..b08bf150 100644 --- a/src/components/donations/AddDonationPaymentModal.svelte +++ b/src/components/donations/AddDonationPaymentModal.svelte @@ -194,7 +194,7 @@ payment_modal_open = false; }} type="button" - class="w-full justify-center rounded-md border border-gray-300 shadow-sm px-4 py-2 bg-white text-base font-medium text-gray-700 hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-indigo-500 hidden lg:block" + class="cancel_modal_button" > {$_("cancel")} diff --git a/src/components/donations/DeleteDonationModal.svelte b/src/components/donations/DeleteDonationModal.svelte index a6109092..b03711c6 100644 --- a/src/components/donations/DeleteDonationModal.svelte +++ b/src/components/donations/DeleteDonationModal.svelte @@ -102,7 +102,7 @@ @@ -111,7 +111,7 @@ modal_open = false; }} type="button" - class="w-full justify-center rounded-md border border-gray-300 shadow-sm px-4 py-2 bg-white text-base font-medium text-gray-700 hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-indigo-500 hidden lg:block" + class="cancel_modal_button" > {$_("cancel")} diff --git a/src/components/donations/DonationTableAction.svelte b/src/components/donations/DonationTableAction.svelte index 1cd8c3c2..94c8e132 100644 --- a/src/components/donations/DonationTableAction.svelte +++ b/src/components/donations/DonationTableAction.svelte @@ -1,26 +1,28 @@ {#if paymentAction} - + {:else} -{$_("enter-payment")} - + {$_("enter-payment")} {/if} diff --git a/src/components/donors/AddDonorModal.svelte b/src/components/donors/AddDonorModal.svelte index ad572e15..503bde19 100644 --- a/src/components/donors/AddDonorModal.svelte +++ b/src/components/donors/AddDonorModal.svelte @@ -433,7 +433,7 @@ modal_open = false; }} type="button" - class="w-full justify-center rounded-md border border-gray-300 shadow-sm px-4 py-2 bg-white text-base font-medium text-gray-700 hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-indigo-500 hidden lg:block" + class="cancel_modal_button" > {$_("cancel")} diff --git a/src/components/donors/ConfirmDonorDeletion.svelte b/src/components/donors/ConfirmDonorDeletion.svelte index 78a12669..90eab449 100644 --- a/src/components/donors/ConfirmDonorDeletion.svelte +++ b/src/components/donors/ConfirmDonorDeletion.svelte @@ -72,14 +72,14 @@ diff --git a/src/components/groups/AddGroupModal.svelte b/src/components/groups/AddGroupModal.svelte index ac249898..375e0810 100644 --- a/src/components/groups/AddGroupModal.svelte +++ b/src/components/groups/AddGroupModal.svelte @@ -174,7 +174,7 @@ modal_open = false; }} type="button" - class="w-full justify-center rounded-md border border-gray-300 shadow-sm px-4 py-2 bg-white text-base font-medium text-gray-700 hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-indigo-500 hidden lg:block" + class="cancel_modal_button" > {$_("cancel")} diff --git a/src/components/orgs/AddOrgModal.svelte b/src/components/orgs/AddOrgModal.svelte index ae7c2eac..aafb770d 100644 --- a/src/components/orgs/AddOrgModal.svelte +++ b/src/components/orgs/AddOrgModal.svelte @@ -294,7 +294,7 @@ modal_open = false; }} type="button" - class="w-full justify-center rounded-md border border-gray-300 shadow-sm px-4 py-2 bg-white text-base font-medium text-gray-700 hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-indigo-500 hidden lg:block" + class="cancel_modal_button" > {$_("cancel")} diff --git a/src/components/orgs/ConfirmOrgDeletionModal.svelte b/src/components/orgs/ConfirmOrgDeletionModal.svelte index 8673f281..beb87c38 100644 --- a/src/components/orgs/ConfirmOrgDeletionModal.svelte +++ b/src/components/orgs/ConfirmOrgDeletionModal.svelte @@ -86,14 +86,14 @@ diff --git a/src/components/runners/AddRunnerModal.svelte b/src/components/runners/AddRunnerModal.svelte index ae10617f..ca97ae96 100644 --- a/src/components/runners/AddRunnerModal.svelte +++ b/src/components/runners/AddRunnerModal.svelte @@ -338,7 +338,7 @@ modal_open = false; }} type="button" - class="w-full justify-center rounded-md border border-gray-300 shadow-sm px-4 py-2 bg-white text-base font-medium text-gray-700 hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-indigo-500 hidden lg:block" + class="cancel_modal_button" > {$_("cancel")} diff --git a/src/components/runners/DeleteRunnerModal.svelte b/src/components/runners/DeleteRunnerModal.svelte index f0edaaa9..3786af1f 100644 --- a/src/components/runners/DeleteRunnerModal.svelte +++ b/src/components/runners/DeleteRunnerModal.svelte @@ -90,7 +90,7 @@ @@ -99,7 +99,7 @@ modal_open = false; }} type="button" - class="w-full justify-center rounded-md border border-gray-300 shadow-sm px-4 py-2 bg-white text-base font-medium text-gray-700 hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-indigo-500 hidden lg:block" + class="cancel_modal_button" > {$_("cancel")} diff --git a/src/components/runners/ImportRunnerModal.svelte b/src/components/runners/ImportRunnerModal.svelte index a5f70285..bac223c1 100644 --- a/src/components/runners/ImportRunnerModal.svelte +++ b/src/components/runners/ImportRunnerModal.svelte @@ -261,7 +261,7 @@ cancelModal(); }} type="button" - class="w-full justify-center rounded-md border border-gray-300 shadow-sm px-4 py-2 bg-white text-base font-medium text-gray-700 hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-indigo-500 hidden lg:block" + class="cancel_modal_button" > {$_("cancel")} @@ -375,7 +375,7 @@ cancelModal(); }} type="button" - class="w-full inline-flex justify-center rounded-md border border-transparent shadow-sm px-4 py-2 bg-red-600 text-base font-medium text-white hover:bg-red-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-red-500" + class="confirm_deletion_button" > {$_("cancel")} diff --git a/src/components/scans/AddScanModal.svelte b/src/components/scans/AddScanModal.svelte index 2e649b4d..77cd314b 100644 --- a/src/components/scans/AddScanModal.svelte +++ b/src/components/scans/AddScanModal.svelte @@ -195,7 +195,7 @@ modal_open = false; }} type="button" - class="w-full justify-center rounded-md border border-gray-300 shadow-sm px-4 py-2 bg-white text-base font-medium text-gray-700 hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-indigo-500 hidden lg:block" + class="cancel_modal_button" > {$_("cancel")} diff --git a/src/components/scans/DeleteScanModal.svelte b/src/components/scans/DeleteScanModal.svelte index da8b44b9..e94a7aa1 100644 --- a/src/components/scans/DeleteScanModal.svelte +++ b/src/components/scans/DeleteScanModal.svelte @@ -90,7 +90,7 @@ @@ -99,7 +99,7 @@ modal_open = false; }} type="button" - class="w-full justify-center rounded-md border border-gray-300 shadow-sm px-4 py-2 bg-white text-base font-medium text-gray-700 hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-indigo-500 hidden lg:block" + class="cancel_modal_button" > {$_("cancel")} diff --git a/src/components/scanstations/AddScanStationModal.svelte b/src/components/scanstations/AddScanStationModal.svelte index 2396a312..fce55016 100644 --- a/src/components/scanstations/AddScanStationModal.svelte +++ b/src/components/scanstations/AddScanStationModal.svelte @@ -203,7 +203,7 @@ modal_open = false; }} type="button" - class="w-full justify-center rounded-md border border-gray-300 shadow-sm px-4 py-2 bg-white text-base font-medium text-gray-700 hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-indigo-500 hidden lg:block" + class="cancel_modal_button" > {$_("cancel")} diff --git a/src/components/scanstations/ConfirmScanStationDeletion.svelte b/src/components/scanstations/ConfirmScanStationDeletion.svelte index f23be5fd..5a471615 100644 --- a/src/components/scanstations/ConfirmScanStationDeletion.svelte +++ b/src/components/scanstations/ConfirmScanStationDeletion.svelte @@ -82,14 +82,14 @@ diff --git a/src/components/settings/ConfirmProfileDeletion.svelte b/src/components/settings/ConfirmProfileDeletion.svelte index 37fa8e0b..24d6c94d 100644 --- a/src/components/settings/ConfirmProfileDeletion.svelte +++ b/src/components/settings/ConfirmProfileDeletion.svelte @@ -85,14 +85,14 @@ diff --git a/src/components/statsclients/AddStatsClientModal.svelte b/src/components/statsclients/AddStatsClientModal.svelte index 2701ff27..20ab7923 100644 --- a/src/components/statsclients/AddStatsClientModal.svelte +++ b/src/components/statsclients/AddStatsClientModal.svelte @@ -148,7 +148,7 @@ modal_open = false; }} type="button" - class="w-full justify-center rounded-md border border-gray-300 shadow-sm px-4 py-2 bg-white text-base font-medium text-gray-700 hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-indigo-500 hidden lg:block" + class="cancel_modal_button" > {$_("cancel")} diff --git a/src/components/statsclients/ConfirmStatsClientDeletion.svelte b/src/components/statsclients/ConfirmStatsClientDeletion.svelte index b1c573ad..fecce6c9 100644 --- a/src/components/statsclients/ConfirmStatsClientDeletion.svelte +++ b/src/components/statsclients/ConfirmStatsClientDeletion.svelte @@ -81,14 +81,14 @@ diff --git a/src/components/teams/AddTeamModal.svelte b/src/components/teams/AddTeamModal.svelte index da2e1995..38141ede 100644 --- a/src/components/teams/AddTeamModal.svelte +++ b/src/components/teams/AddTeamModal.svelte @@ -199,7 +199,7 @@ modal_open = false; }} type="button" - class="w-full justify-center rounded-md border border-gray-300 shadow-sm px-4 py-2 bg-white text-base font-medium text-gray-700 hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-indigo-500 hidden lg:block" + class="cancel_modal_button" > {$_("cancel")} diff --git a/src/components/teams/ConfirmTeamDeletionModal.svelte b/src/components/teams/ConfirmTeamDeletionModal.svelte index f13365bb..10980743 100644 --- a/src/components/teams/ConfirmTeamDeletionModal.svelte +++ b/src/components/teams/ConfirmTeamDeletionModal.svelte @@ -85,14 +85,14 @@ diff --git a/src/components/tracks/AddTrackModal.svelte b/src/components/tracks/AddTrackModal.svelte index f735095d..c288ca8d 100644 --- a/src/components/tracks/AddTrackModal.svelte +++ b/src/components/tracks/AddTrackModal.svelte @@ -230,7 +230,7 @@ modal_open = false; }} type="button" - class="w-full justify-center rounded-md border border-gray-300 shadow-sm px-4 py-2 bg-white text-base font-medium text-gray-700 hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-indigo-500 hidden lg:block" + class="cancel_modal_button" > {$_("cancel")} diff --git a/src/components/users/AddUserModal.svelte b/src/components/users/AddUserModal.svelte index 40ce91ca..28e2fbf3 100644 --- a/src/components/users/AddUserModal.svelte +++ b/src/components/users/AddUserModal.svelte @@ -287,7 +287,7 @@ modal_open = false; }} type="button" - class="w-full justify-center rounded-md border border-gray-300 shadow-sm px-4 py-2 bg-white text-base font-medium text-gray-700 hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-indigo-500 hidden lg:block" + class="cancel_modal_button" > {$_("cancel")} diff --git a/src/style.css b/src/style.css index 1bc948b5..35cef8ca 100644 --- a/src/style.css +++ b/src/style.css @@ -31,3 +31,9 @@ .donation_active_tab { @apply min-w-0 flex-1 bg-blue-400 text-white first:border-s-0 border-s border-b-2 border-neutral-200 py-4 px-4 text-sm font-medium text-center overflow-hidden cursor-pointer focus:outline-hidden; } +.confirm_deletion_button { + @apply w-full cursor-pointer inline-flex justify-center rounded-md border border-transparent shadow-sm px-4 py-2 bg-red-600 text-base font-medium text-white hover:bg-red-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-red-500; +} +.cancel_modal_button { + @apply w-full cursor-pointer justify-center rounded-md border border-gray-300 shadow-sm px-4 py-2 bg-white text-base font-medium text-gray-700 hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-indigo-500 hidden lg:block; +}