From 3ba9f399b82d11d24970d89cc6d557ca75174263 Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Thu, 25 May 2023 21:23:03 +0200 Subject: [PATCH] fix --- app/Http/Livewire/ForceUpgrade.php | 2 +- resources/css/app.css | 17 +++++++---------- resources/views/auth/login.blade.php | 12 +++--------- resources/views/auth/register.blade.php | 6 +++--- .../views/livewire/force-upgrade.blade.php | 3 ++- resources/views/livewire/upgrading.blade.php | 8 ++++---- 6 files changed, 20 insertions(+), 28 deletions(-) diff --git a/app/Http/Livewire/ForceUpgrade.php b/app/Http/Livewire/ForceUpgrade.php index 369c4fb11..80dc03fb9 100644 --- a/app/Http/Livewire/ForceUpgrade.php +++ b/app/Http/Livewire/ForceUpgrade.php @@ -10,6 +10,6 @@ class ForceUpgrade extends Component public function upgrade() { $this->emit('updateInitiated'); - dispatch_sync(new InstanceAutoUpdateJob(force: true)); + dispatch(new InstanceAutoUpdateJob(force: true)); } } diff --git a/resources/css/app.css b/resources/css/app.css index 1275bfe58..4d5bea20e 100644 --- a/resources/css/app.css +++ b/resources/css/app.css @@ -2,16 +2,16 @@ @tailwind components; @tailwind utilities; -* { - //outline: solid 0.25rem hsla(210, 100%, 100%, 0.5); - @apply scrollbar-thumb-coollabs-100 scrollbar-track-coolgray-200 scrollbar-w-1; -} html { - @apply h-full min-h-full bg-coolgray-100; + @apply min-h-screen h-full bg-coolgray-100; } body { - @apply bg-coolgray-100 text-neutral-400 min-h-full antialiased; + @apply min-h-screen bg-coolgray-100 text-neutral-400 antialiased scrollbar-thumb-coollabs-100 scrollbar-track-coolgray-200 scrollbar-w-1; } +main { + @apply px-32 xl:px-14 mx-auto max-w-screen-xl; +} + input[type="checkbox"] { @apply toggle toggle-warning toggle-xs rounded; } @@ -59,9 +59,6 @@ a { @apply text-neutral-400 hover:text-white text-sm link link-hover hover:bg-transparent; } -main { - @apply h-full w-full pb-10 px-32 xl:px-14 pt-8 mx-auto max-w-screen-xl; -} .main-navbar { @apply fixed top-0 left-0 min-h-screen overflow-hidden; } @@ -123,5 +120,5 @@ main { } } .bg-coollabs-gradient { - @apply text-transparent bg-clip-text bg-gradient-to-r from-coollabs via-pink-500 to-red-500; + @apply text-transparent bg-clip-text bg-gradient-to-r from-purple-500 via-pink-500 to-red-500; } \ No newline at end of file diff --git a/resources/views/auth/login.blade.php b/resources/views/auth/login.blade.php index 1fe58f04a..ff0c8004a 100644 --- a/resources/views/auth/login.blade.php +++ b/resources/views/auth/login.blade.php @@ -5,8 +5,8 @@

{{ __('auth.login') }}

@if ($is_registration_enabled) - - {{ __('auth.register-now') }} + + {{ __('auth.register-now') }} @else
{{ __('auth.registration_disabled') }}
@@ -21,23 +21,17 @@ @else - + @endenv - - @if ($errors->any())
{{ __('auth.failed') }}
@endif {{ __('auth.login') }} - -
- - diff --git a/resources/views/auth/register.blade.php b/resources/views/auth/register.blade.php index 03ba7fe87..40a6a8409 100644 --- a/resources/views/auth/register.blade.php +++ b/resources/views/auth/register.blade.php @@ -1,11 +1,11 @@ -
+
Coolify

{{ __('auth.register') }}

- - {{ __('auth.already-registered') }} + + {{ __('auth.already-registered') }}
diff --git a/resources/views/livewire/force-upgrade.blade.php b/resources/views/livewire/force-upgrade.blade.php index fd6e5881d..7a563aece 100644 --- a/resources/views/livewire/force-upgrade.blade.php +++ b/resources/views/livewire/force-upgrade.blade.php @@ -8,4 +8,5 @@ - Force Upgrade + Force Upgrade + diff --git a/resources/views/livewire/upgrading.blade.php b/resources/views/livewire/upgrading.blade.php index 2e7b4a2c4..8b1c82446 100644 --- a/resources/views/livewire/upgrading.blade.php +++ b/resources/views/livewire/upgrading.blade.php @@ -1,11 +1,11 @@ -
+