Merge branch 'next' into caddy_stripprefix_fix
This commit is contained in:
		| @@ -14,8 +14,8 @@ | ||||
|     'w-full' => $fullWidth, | ||||
| ])> | ||||
|     @if (!$hideLabel) | ||||
|         <label @class(['flex gap-4 px-0 min-w-fit label', 'opacity-40' => $disabled])> | ||||
|             <span class="flex gap-2"> | ||||
|         <label @class(['flex gap-4 items-center px-0 min-w-fit label w-full cursor-pointer', 'opacity-40' => $disabled])> | ||||
|             <span class="flex flex-grow gap-2"> | ||||
|                 @if ($label) | ||||
|                     {!! $label !!} | ||||
|                 @else | ||||
| @@ -25,11 +25,11 @@ | ||||
|                     <x-helper :helper="$helper" /> | ||||
|                 @endif | ||||
|             </span> | ||||
|         </label> | ||||
|     @endif | ||||
|     <span class="flex-grow"></span> | ||||
|             <input @disabled($disabled) type="checkbox" {{ $attributes->merge(['class' => $defaultClass]) }} | ||||
|                 @if ($instantSave) wire:loading.attr="disabled" wire:click='{{ $instantSave === 'instantSave' || $instantSave == '1' ? 'instantSave' : $instantSave }}' | ||||
|                 wire:model={{ $id }} @else wire:model={{ $value ?? $id }} @endif /> | ||||
| 
 | ||||
|     @if (!$hideLabel) | ||||
|         </label> | ||||
|     @endif | ||||
| </div> | ||||
|   | ||||
| @@ -180,7 +180,7 @@ | ||||
|                 </div> | ||||
|                 <div class="pb-4">Persistent storage to preserve data between deployments.</div> | ||||
|                 <div class="pb-4 dark:text-warning text-coollabs">If you would like to add a volume, you must add it to | ||||
|                     your compose file (General tab).</div> | ||||
|                     your compose file (Service Stack tab).</div> | ||||
|                 @foreach ($applications as $application) | ||||
|                     <livewire:project.service.storage wire:key="application-{{ $application->id }}" :resource="$application" | ||||
|                         lazy /> | ||||
|   | ||||
| @@ -71,10 +71,10 @@ | ||||
|                 <div class="flex gap-2 md:flex-row flex-col w-full"> | ||||
|                     <x-forms.input id="public_ipv4" type="password" label="Instance's IPv4" | ||||
|                         helper="Enter the IPv4 address of the instance.<br><br>It is useful if you have several IPv4 addresses and Coolify could not detect the correct one." | ||||
|                         placeholder="1.2.3.4" /> | ||||
|                         placeholder="1.2.3.4" autocomplete="new-password" /> | ||||
|                     <x-forms.input id="public_ipv6" type="password" label="Instance's IPv6" | ||||
|                         helper="Enter the IPv6 address of the instance.<br><br>It is useful if you have several IPv6 addresses and Coolify could not detect the correct one." | ||||
|                         placeholder="2001:db8::1" /> | ||||
|                         placeholder="2001:db8::1" autocomplete="new-password" /> | ||||
|                 </div> | ||||
|                 <h4 class="w-full pt-6">DNS Validation</h4> | ||||
|                 <div class="md:w-96"> | ||||
| @@ -134,7 +134,9 @@ | ||||
|         <h4 class="py-4">Confirmation Settings</h4> | ||||
|         <div x-data="{ open: false }" class="mb-32 md:w-[40rem]"> | ||||
|             <button type="button" @click.prevent="open = !open" | ||||
|                 class="flex items-center justify-between w-full p-4 bg-coolgray-100 hover:bg-coolgray-200 rounded-md"> | ||||
|                 class="flex items-center justify-between w-full p-4 rounded-md
 | ||||
|                        dark:bg-coolgray-100 dark:hover:bg-coolgray-200  | ||||
|                        bg-gray-100 hover:bg-gray-200">
 | ||||
|                 <span class="font-medium">Two-Step Confirmation Settings</span> | ||||
|                 <svg class="w-5 h-5 transition-transform" :class="{ 'rotate-180': open }" fill="none" | ||||
|                     stroke="currentColor" viewBox="0 0 24 24"> | ||||
|   | ||||
		Reference in New Issue
	
	Block a user
	 konstchri
					konstchri