Skip to content

Commit

Permalink
Adjusted spacing to make it same as before #930. (#935)
Browse files Browse the repository at this point in the history 
* Fixed button spacing issue in dialog modal footer.

* Modified confirmation-modal to avoid button spacing issue and increased margin to ml-3 on second button to match the spacing before this modification.

* Applied fix to Inertia version too.
  • Loading branch information
@ravibpatel
ravibpatel authored Dec 30, 2021
1 parent 5d4168e commit 43827f2
Show file tree
Hide file tree
Showing 14 changed files with 20 additions and 20 deletions.
2 changes: 1 addition & 1 deletion resources/views/components/confirmation-modal.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
</div>
</div>

<div class="px-6 py-4 bg-gray-100 text-right">
<div class="flex flex-row justify-end px-6 py-4 bg-gray-100 text-right">
{{ $footer }}
</div>
</x-jet-modal>
2 changes: 1 addition & 1 deletion resources/views/components/confirms-password.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
{{ __('Cancel') }}
</x-jet-secondary-button>

<x-jet-button class="ml-2" dusk="confirm-password-button" wire:click="confirmPassword" wire:loading.attr="disabled">
<x-jet-button class="ml-3" dusk="confirm-password-button" wire:click="confirmPassword" wire:loading.attr="disabled">
{{ $button }}
</x-jet-button>
</x-slot>
Expand Down
2 changes: 1 addition & 1 deletion stubs/inertia/resources/js/Jetstream/ConfirmationModal.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
</div>
</div>

<div class="px-6 py-4 bg-gray-100 text-right">
<div class="flex flex-row justify-end px-6 py-4 bg-gray-100 text-right">
<slot name="footer">
</slot>
</div>
Expand Down
2 changes: 1 addition & 1 deletion stubs/inertia/resources/js/Jetstream/ConfirmsPassword.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
Cancel
</jet-secondary-button>

<jet-button class="ml-2" @click="confirmPassword" :class="{ 'opacity-25': form.processing }" :disabled="form.processing">
<jet-button class="ml-3" @click="confirmPassword" :class="{ 'opacity-25': form.processing }" :disabled="form.processing">
{{ button }}
</jet-button>
</template>
Expand Down
4 changes: 2 additions & 2 deletions stubs/inertia/resources/js/Pages/API/Partials/ApiTokenManager.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@
Cancel
</jet-secondary-button>

<jet-button class="ml-2" @click="updateApiToken" :class="{ 'opacity-25': updateApiTokenForm.processing }" :disabled="updateApiTokenForm.processing">
<jet-button class="ml-3" @click="updateApiToken" :class="{ 'opacity-25': updateApiTokenForm.processing }" :disabled="updateApiTokenForm.processing">
Save
</jet-button>
</template>
Expand All @@ -155,7 +155,7 @@
Cancel
</jet-secondary-button>

<jet-danger-button class="ml-2" @click="deleteApiToken" :class="{ 'opacity-25': deleteApiTokenForm.processing }" :disabled="deleteApiTokenForm.processing">
<jet-danger-button class="ml-3" @click="deleteApiToken" :class="{ 'opacity-25': deleteApiTokenForm.processing }" :disabled="deleteApiTokenForm.processing">
Delete
</jet-danger-button>
</template>
Expand Down
2 changes: 1 addition & 1 deletion stubs/inertia/resources/js/Pages/Profile/Partials/DeleteUserForm.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
Cancel
</jet-secondary-button>

<jet-danger-button class="ml-2" @click="deleteUser" :class="{ 'opacity-25': form.processing }" :disabled="form.processing">
<jet-danger-button class="ml-3" @click="deleteUser" :class="{ 'opacity-25': form.processing }" :disabled="form.processing">
Delete Account
</jet-danger-button>
</template>
Expand Down
2 changes: 1 addition & 1 deletion stubs/inertia/resources/js/Pages/Profile/Partials/LogoutOtherBrowserSessionsForm.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@
Cancel
</jet-secondary-button>

<jet-button class="ml-2" @click="logoutOtherBrowserSessions" :class="{ 'opacity-25': form.processing }" :disabled="form.processing">
<jet-button class="ml-3" @click="logoutOtherBrowserSessions" :class="{ 'opacity-25': form.processing }" :disabled="form.processing">
Log Out Other Browser Sessions
</jet-button>
</template>
Expand Down
2 changes: 1 addition & 1 deletion stubs/inertia/resources/js/Pages/Teams/Partials/DeleteTeamForm.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
Cancel
</jet-secondary-button>

<jet-danger-button class="ml-2" @click="deleteTeam" :class="{ 'opacity-25': form.processing }" :disabled="form.processing">
<jet-danger-button class="ml-3" @click="deleteTeam" :class="{ 'opacity-25': form.processing }" :disabled="form.processing">
Delete Team
</jet-danger-button>
</template>
Expand Down
6 changes: 3 additions & 3 deletions stubs/inertia/resources/js/Pages/Teams/Partials/TeamMemberManager.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@
Cancel
</jet-secondary-button>

<jet-button class="ml-2" @click="updateRole" :class="{ 'opacity-25': updateRoleForm.processing }" :disabled="updateRoleForm.processing">
<jet-button class="ml-3" @click="updateRole" :class="{ 'opacity-25': updateRoleForm.processing }" :disabled="updateRoleForm.processing">
Save
</jet-button>
</template>
Expand All @@ -217,7 +217,7 @@
Cancel
</jet-secondary-button>

<jet-danger-button class="ml-2" @click="leaveTeam" :class="{ 'opacity-25': leaveTeamForm.processing }" :disabled="leaveTeamForm.processing">
<jet-danger-button class="ml-3" @click="leaveTeam" :class="{ 'opacity-25': leaveTeamForm.processing }" :disabled="leaveTeamForm.processing">
Leave
</jet-danger-button>
</template>
Expand All @@ -238,7 +238,7 @@
Cancel
</jet-secondary-button>

<jet-danger-button class="ml-2" @click="removeTeamMember" :class="{ 'opacity-25': removeTeamMemberForm.processing }" :disabled="removeTeamMemberForm.processing">
<jet-danger-button class="ml-3" @click="removeTeamMember" :class="{ 'opacity-25': removeTeamMemberForm.processing }" :disabled="removeTeamMemberForm.processing">
Remove
</jet-danger-button>
</template>
Expand Down
4 changes: 2 additions & 2 deletions stubs/livewire/resources/views/api/api-token-manager.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ class="mt-4 bg-gray-100 px-4 py-2 rounded font-mono text-sm text-gray-500 w-full
{{ __('Cancel') }}
</x-jet-secondary-button>

<x-jet-button class="ml-2" wire:click="updateApiToken" wire:loading.attr="disabled">
<x-jet-button class="ml-3" wire:click="updateApiToken" wire:loading.attr="disabled">
{{ __('Save') }}
</x-jet-button>
</x-slot>
Expand All @@ -161,7 +161,7 @@ class="mt-4 bg-gray-100 px-4 py-2 rounded font-mono text-sm text-gray-500 w-full
{{ __('Cancel') }}
</x-jet-secondary-button>

<x-jet-danger-button class="ml-2" wire:click="deleteApiToken" wire:loading.attr="disabled">
<x-jet-danger-button class="ml-3" wire:click="deleteApiToken" wire:loading.attr="disabled">
{{ __('Delete') }}
</x-jet-danger-button>
</x-slot>
Expand Down
2 changes: 1 addition & 1 deletion stubs/livewire/resources/views/profile/delete-user-form.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
{{ __('Cancel') }}
</x-jet-secondary-button>

<x-jet-danger-button class="ml-2" wire:click="deleteUser" wire:loading.attr="disabled">
<x-jet-danger-button class="ml-3" wire:click="deleteUser" wire:loading.attr="disabled">
{{ __('Delete Account') }}
</x-jet-danger-button>
</x-slot>
Expand Down
2 changes: 1 addition & 1 deletion stubs/livewire/resources/views/profile/logout-other-browser-sessions-form.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@
{{ __('Cancel') }}
</x-jet-secondary-button>

<x-jet-button class="ml-2"
<x-jet-button class="ml-3"
wire:click="logoutOtherBrowserSessions"
wire:loading.attr="disabled">
{{ __('Log Out Other Browser Sessions') }}
Expand Down
2 changes: 1 addition & 1 deletion stubs/livewire/resources/views/teams/delete-team-form.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
{{ __('Cancel') }}
</x-jet-secondary-button>

<x-jet-danger-button class="ml-2" wire:click="deleteTeam" wire:loading.attr="disabled">
<x-jet-danger-button class="ml-3" wire:click="deleteTeam" wire:loading.attr="disabled">
{{ __('Delete Team') }}
</x-jet-danger-button>
</x-slot>
Expand Down
6 changes: 3 additions & 3 deletions stubs/livewire/resources/views/teams/team-member-manager.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,7 @@
{{ __('Cancel') }}
</x-jet-secondary-button>

<x-jet-button class="ml-2" wire:click="updateRole" wire:loading.attr="disabled">
<x-jet-button class="ml-3" wire:click="updateRole" wire:loading.attr="disabled">
{{ __('Save') }}
</x-jet-button>
</x-slot>
Expand All @@ -227,7 +227,7 @@
{{ __('Cancel') }}
</x-jet-secondary-button>

<x-jet-danger-button class="ml-2" wire:click="leaveTeam" wire:loading.attr="disabled">
<x-jet-danger-button class="ml-3" wire:click="leaveTeam" wire:loading.attr="disabled">
{{ __('Leave') }}
</x-jet-danger-button>
</x-slot>
Expand All @@ -248,7 +248,7 @@
{{ __('Cancel') }}
</x-jet-secondary-button>

<x-jet-danger-button class="ml-2" wire:click="removeTeamMember" wire:loading.attr="disabled">
<x-jet-danger-button class="ml-3" wire:click="removeTeamMember" wire:loading.attr="disabled">
{{ __('Remove') }}
</x-jet-danger-button>
</x-slot>
Expand Down

0 comments on commit 43827f2

Please sign in to comment.