Shiloh/lasthourcloud
Shiloh/lasthourcloud
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases 4 Wiki Activity

Merge pull request #2688 from ari-party/next

Browse Source 
Multiple CSS changes
This commit is contained in:
Andras Bacsai 2024-07-10 13:29:04 +02:00 committed by GitHub
commit fd4dd1edfa
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
resources/views/livewire/notifications/email.blade.php
View File

@ -3,7 +3,7 @@
Notifications | Coolify Notifications | Coolify
</x-slot> </x-slot>
<x-notification.navbar /> <x-notification.navbar />
<form wire:submit='submit' class="flex flex-col gap-4"> <form wire:submit='submit' class="flex flex-col gap-4 pb-4">
<div class="flex items-center gap-2"> <div class="flex items-center gap-2">
<h2>Email</h2> <h2>Email</h2>
<x-forms.button type="submit"> <x-forms.button type="submit">
@ -33,7 +33,7 @@
label="Use Hosted Email Service" /> label="Use Hosted Email Service" />
</div> </div>
@else @else
<div class="pb-4 w-96"> <div class="w-96 pb-4">
<x-forms.checkbox disabled id="team.use_instance_email_settings" <x-forms.checkbox disabled id="team.use_instance_email_settings"
label="Use Hosted Email Service (Pro+ subscription required)" /> label="Use Hosted Email Service (Pro+ subscription required)" />
</div> </div>
@ -45,7 +45,7 @@
</div> </div>
@endif @endif
@if (!$team->use_instance_email_settings) @if (!$team->use_instance_email_settings)
<form class="flex flex-col items-end gap-2 pb-4 xl:flex-row" wire:submit='submitFromFields'> <form class="flex flex-col items-end gap-2 pt-4 pb-4 xl:flex-row" wire:submit='submitFromFields'>
<x-forms.input required id="team.smtp_from_name" helper="Name used in emails." label="From Name" /> <x-forms.input required id="team.smtp_from_name" helper="Name used in emails." label="From Name" />
<x-forms.input required id="team.smtp_from_address" helper="Email address used in emails." <x-forms.input required id="team.smtp_from_address" helper="Email address used in emails."
label="From Address" /> label="From Address" />

3
resources/views/livewire/project/resource/index.blade.php
View File

@ -40,9 +40,6 @@ class="button">+
<livewire:project.resource.environment-select :environments="$project->environments" /> <livewire:project.resource.environment-select :environments="$project->environments" />
</div> </div>
</li> </li>
<li>
</li>
</ol> </ol>
</nav> </nav>
</div> </div>

6
resources/views/livewire/server/form.blade.php
View File

@ -135,7 +135,7 @@ class="w-full mt-8 mb-4 font-bold box-without-bg bg-coollabs hover:bg-coollabs-1
</div> </div>
@if ($server->isFunctional()) @if ($server->isFunctional())
<h3 class="py-4">Settings</h3> <h3 class="pt-4">Settings</h3>
<div class="flex flex-wrap gap-2 sm:flex-nowrap"> <div class="flex flex-wrap gap-2 sm:flex-nowrap">
<x-forms.input id="cleanup_after_percentage" label="Disk cleanup threshold (%)" required <x-forms.input id="cleanup_after_percentage" label="Disk cleanup threshold (%)" required
helper="The disk cleanup task will run when the disk usage exceeds this threshold." /> helper="The disk cleanup task will run when the disk usage exceeds this threshold." />
@ -144,8 +144,8 @@ class="w-full mt-8 mb-4 font-bold box-without-bg bg-coollabs hover:bg-coollabs-1
<x-forms.input id="server.settings.dynamic_timeout" label="Deployment timeout (seconds)" required <x-forms.input id="server.settings.dynamic_timeout" label="Deployment timeout (seconds)" required
helper="You can define the maximum duration for a deployment to run before timing it out." /> helper="You can define the maximum duration for a deployment to run before timing it out." />
</div> </div>
<div class="flex items-center gap-2"> <div class="flex items-center gap-2 pt-4 pb-2">
<h3 class="py-4">Sentinel</h3> <h3>Sentinel</h3>
@if ($server->isSentinelEnabled()) @if ($server->isSentinelEnabled())
<x-forms.button wire:click='restartSentinel'>Restart</x-forms.button> <x-forms.button wire:click='restartSentinel'>Restart</x-forms.button>
@endif @endif

4
resources/views/livewire/server/proxy.blade.php
View File

@ -21,9 +21,9 @@
href="https://coolify.io/docs/knowledge-base/server/proxies#switch-between-proxies">this</a>. href="https://coolify.io/docs/knowledge-base/server/proxies#switch-between-proxies">this</a>.
</div> </div>
@if ($server->proxyType() === 'TRAEFIK_V2') @if ($server->proxyType() === 'TRAEFIK_V2')
<h4 class="pb-4">Traefik</h4> <h4>Traefik</h4>
@elseif ($server->proxyType() === 'CADDY') @elseif ($server->proxyType() === 'CADDY')
<h4 class="pb-4 ">Caddy</h4> <h4>Caddy</h4>
@endif @endif
@if ( @if (
$server->proxy->last_applied_settings && $server->proxy->last_applied_settings &&

2
resources/views/livewire/server/proxy/deploy.blade.php
View File

@ -11,7 +11,7 @@
</x-slot:content> </x-slot:content>
</x-slide-over> </x-slide-over>
@if (data_get($server, 'proxy.status') === 'running') @if (data_get($server, 'proxy.status') === 'running')
<div class="flex gap-4"> <div class="flex gap-2">
@if ($currentRoute === 'server.proxy' && $traefikDashboardAvailable && $server->proxyType() === 'TRAEFIK_V2') @if ($currentRoute === 'server.proxy' && $traefikDashboardAvailable && $server->proxyType() === 'TRAEFIK_V2')
<button> <button>
<a target="_blank" href="http://{{ $serverIp }}:8080"> <a target="_blank" href="http://{{ $serverIp }}:8080">