Skip to content

Commit 0e9c31e

Browse files
ravibpatelGeoSot
ravibpatel
authored and
GeoSot
committed
Adjusted spacing to make it same as before laravel#930. (laravel#935)
* 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.
1 parent c06bf9c commit 0e9c31e

14 files changed

+20
-20
lines changed

Diff for: ‎resources/views/components/confirmation-modal.blade.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
</div>
2222
</div>
2323

24-
<div class="px-6 py-4 bg-gray-100 text-right">
24+
<div class="flex flex-row justify-end px-6 py-4 bg-gray-100 text-right">
2525
{{ $footer }}
2626
</div>
2727
</x-jet-modal>

Diff for: ‎resources/views/components/confirms-password.blade.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
{{ __('Cancel') }}
3939
</x-jet-secondary-button>
4040

41-
<x-jet-button class="ml-2" dusk="confirm-password-button" wire:click="confirmPassword" wire:loading.attr="disabled">
41+
<x-jet-button class="ml-3" dusk="confirm-password-button" wire:click="confirmPassword" wire:loading.attr="disabled">
4242
{{ $button }}
4343
</x-jet-button>
4444
</x-slot>

Diff for: ‎stubs/inertia/resources/js/Jetstream/ConfirmationModal.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
</div>
2121
</div>
2222

23-
<div class="px-6 py-4 bg-gray-100 text-right">
23+
<div class="flex flex-row justify-end px-6 py-4 bg-gray-100 text-right">
2424
<slot name="footer">
2525
</slot>
2626
</div>

Diff for: ‎stubs/inertia/resources/js/Jetstream/ConfirmsPassword.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
Cancel
2828
</jet-secondary-button>
2929

30-
<jet-button class="ml-2" @click="confirmPassword" :class="{ 'opacity-25': form.processing }" :disabled="form.processing">
30+
<jet-button class="ml-3" @click="confirmPassword" :class="{ 'opacity-25': form.processing }" :disabled="form.processing">
3131
{{ button }}
3232
</jet-button>
3333
</template>

Diff for: ‎stubs/inertia/resources/js/Pages/API/Partials/ApiTokenManager.vue

+2-2
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@
134134
Cancel
135135
</jet-secondary-button>
136136

137-
<jet-button class="ml-2" @click="updateApiToken" :class="{ 'opacity-25': updateApiTokenForm.processing }" :disabled="updateApiTokenForm.processing">
137+
<jet-button class="ml-3" @click="updateApiToken" :class="{ 'opacity-25': updateApiTokenForm.processing }" :disabled="updateApiTokenForm.processing">
138138
Save
139139
</jet-button>
140140
</template>
@@ -155,7 +155,7 @@
155155
Cancel
156156
</jet-secondary-button>
157157

158-
<jet-danger-button class="ml-2" @click="deleteApiToken" :class="{ 'opacity-25': deleteApiTokenForm.processing }" :disabled="deleteApiTokenForm.processing">
158+
<jet-danger-button class="ml-3" @click="deleteApiToken" :class="{ 'opacity-25': deleteApiTokenForm.processing }" :disabled="deleteApiTokenForm.processing">
159159
Delete
160160
</jet-danger-button>
161161
</template>

Diff for: ‎stubs/inertia/resources/js/Pages/Profile/Partials/DeleteUserForm.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
Cancel
4444
</jet-secondary-button>
4545

46-
<jet-danger-button class="ml-2" @click="deleteUser" :class="{ 'opacity-25': form.processing }" :disabled="form.processing">
46+
<jet-danger-button class="ml-3" @click="deleteUser" :class="{ 'opacity-25': form.processing }" :disabled="form.processing">
4747
Delete Account
4848
</jet-danger-button>
4949
</template>

Diff for: ‎stubs/inertia/resources/js/Pages/Profile/Partials/LogoutOtherBrowserSessionsForm.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@
7777
Cancel
7878
</jet-secondary-button>
7979

80-
<jet-button class="ml-2" @click="logoutOtherBrowserSessions" :class="{ 'opacity-25': form.processing }" :disabled="form.processing">
80+
<jet-button class="ml-3" @click="logoutOtherBrowserSessions" :class="{ 'opacity-25': form.processing }" :disabled="form.processing">
8181
Log Out Other Browser Sessions
8282
</jet-button>
8383
</template>

Diff for: ‎stubs/inertia/resources/js/Pages/Teams/Partials/DeleteTeamForm.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
Cancel
3535
</jet-secondary-button>
3636

37-
<jet-danger-button class="ml-2" @click="deleteTeam" :class="{ 'opacity-25': form.processing }" :disabled="form.processing">
37+
<jet-danger-button class="ml-3" @click="deleteTeam" :class="{ 'opacity-25': form.processing }" :disabled="form.processing">
3838
Delete Team
3939
</jet-danger-button>
4040
</template>

Diff for: ‎stubs/inertia/resources/js/Pages/Teams/Partials/TeamMemberManager.vue

+3-3
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@
196196
Cancel
197197
</jet-secondary-button>
198198

199-
<jet-button class="ml-2" @click="updateRole" :class="{ 'opacity-25': updateRoleForm.processing }" :disabled="updateRoleForm.processing">
199+
<jet-button class="ml-3" @click="updateRole" :class="{ 'opacity-25': updateRoleForm.processing }" :disabled="updateRoleForm.processing">
200200
Save
201201
</jet-button>
202202
</template>
@@ -217,7 +217,7 @@
217217
Cancel
218218
</jet-secondary-button>
219219

220-
<jet-danger-button class="ml-2" @click="leaveTeam" :class="{ 'opacity-25': leaveTeamForm.processing }" :disabled="leaveTeamForm.processing">
220+
<jet-danger-button class="ml-3" @click="leaveTeam" :class="{ 'opacity-25': leaveTeamForm.processing }" :disabled="leaveTeamForm.processing">
221221
Leave
222222
</jet-danger-button>
223223
</template>
@@ -238,7 +238,7 @@
238238
Cancel
239239
</jet-secondary-button>
240240

241-
<jet-danger-button class="ml-2" @click="removeTeamMember" :class="{ 'opacity-25': removeTeamMemberForm.processing }" :disabled="removeTeamMemberForm.processing">
241+
<jet-danger-button class="ml-3" @click="removeTeamMember" :class="{ 'opacity-25': removeTeamMemberForm.processing }" :disabled="removeTeamMemberForm.processing">
242242
Remove
243243
</jet-danger-button>
244244
</template>

Diff for: ‎stubs/livewire/resources/views/api/api-token-manager.blade.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ class="mt-4 bg-gray-100 px-4 py-2 rounded font-mono text-sm text-gray-500 w-full
140140
{{ __('Cancel') }}
141141
</x-jet-secondary-button>
142142

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

164-
<x-jet-danger-button class="ml-2" wire:click="deleteApiToken" wire:loading.attr="disabled">
164+
<x-jet-danger-button class="ml-3" wire:click="deleteApiToken" wire:loading.attr="disabled">
165165
{{ __('Delete') }}
166166
</x-jet-danger-button>
167167
</x-slot>

Diff for: ‎stubs/livewire/resources/views/profile/delete-user-form.blade.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
{{ __('Cancel') }}
4444
</x-jet-secondary-button>
4545

46-
<x-jet-danger-button class="ml-2" wire:click="deleteUser" wire:loading.attr="disabled">
46+
<x-jet-danger-button class="ml-3" wire:click="deleteUser" wire:loading.attr="disabled">
4747
{{ __('Delete Account') }}
4848
</x-jet-danger-button>
4949
</x-slot>

Diff for: ‎stubs/livewire/resources/views/profile/logout-other-browser-sessions-form.blade.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@
8686
{{ __('Cancel') }}
8787
</x-jet-secondary-button>
8888

89-
<x-jet-button class="ml-2"
89+
<x-jet-button class="ml-3"
9090
wire:click="logoutOtherBrowserSessions"
9191
wire:loading.attr="disabled">
9292
{{ __('Log Out Other Browser Sessions') }}

Diff for: ‎stubs/livewire/resources/views/teams/delete-team-form.blade.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
{{ __('Cancel') }}
3434
</x-jet-secondary-button>
3535

36-
<x-jet-danger-button class="ml-2" wire:click="deleteTeam" wire:loading.attr="disabled">
36+
<x-jet-danger-button class="ml-3" wire:click="deleteTeam" wire:loading.attr="disabled">
3737
{{ __('Delete Team') }}
3838
</x-jet-danger-button>
3939
</x-slot>

Diff for: ‎stubs/livewire/resources/views/teams/team-member-manager.blade.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,7 @@
206206
{{ __('Cancel') }}
207207
</x-jet-secondary-button>
208208

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

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

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

0 commit comments

Comments
 (0)