diff --git a/app/Livewire/App/Icon.php b/app/Livewire/App/Icon.php index e92a392..1b48b52 100644 --- a/app/Livewire/App/Icon.php +++ b/app/Livewire/App/Icon.php @@ -7,6 +7,8 @@ use Livewire\Component; class Icon extends Component { public string $name = 'paw-simple'; + public string $label = ''; + public string $style = ''; public string $attrs = ''; public string|null $slot = null; diff --git a/app/Livewire/Pages/Users.php b/app/Livewire/Pages/Users.php index a929409..1607837 100644 --- a/app/Livewire/Pages/Users.php +++ b/app/Livewire/Pages/Users.php @@ -3,10 +3,12 @@ namespace App\Livewire\Pages; use App\Models\User; +use Livewire\Attributes\Title; use Livewire\Component; class Users extends Component { + #[Title('Users')] public function render() { return view('livewire.pages.users', [ 'users' => User::paginate(10) ]); diff --git a/deploy/Dockerfile b/deploy/Dockerfile index 7b3ba06..2cd033c 100644 --- a/deploy/Dockerfile +++ b/deploy/Dockerfile @@ -1,7 +1,8 @@ FROM dunglas/frankenphp # Copy php.ini -COPY ./deploy/php.ini $PHP_INI_DIR/php-app-config.ini +# COPY ./deploy/php.ini $PHP_INI_DIR/php-app-config.ini +COPY --link ./deploy/php.ini $PHP_INI_DIR/conf.d/ RUN apt update -y && apt install -y --no-install-recommends git nodejs npm COPY --from=composer:lts /usr/bin/composer /usr/bin/composer diff --git a/deploy/php.ini b/deploy/php.ini index 6d2a6e8..f92f217 100644 --- a/deploy/php.ini +++ b/deploy/php.ini @@ -1,4 +1,3 @@ -[php] upload_max_filesize = 100M post_max_filesize = 128M memory_limit = 1G diff --git a/resources/css/app.css b/resources/css/app.css index 5794139..0117c07 100644 --- a/resources/css/app.css +++ b/resources/css/app.css @@ -1,8 +1,9 @@ @import url('https://early.webawesome.com/webawesome@3.0.0-beta.1/dist/styles/webawesome.css'); @import url('https://early.webawesome.com/webawesome@3.0.0-beta.1/dist/styles/utilities.css'); +@import url('https://early.webawesome.com/webawesome@3.0.0-alpha.13/dist/styles/themes/awesome/typography.css'); @import url('https://early.webawesome.com/webawesome@3.0.0-beta.1/dist/styles/themes/tailspin.css'); -@import url('https://early.webawesome.com/webawesome@3.0.0-beta.1/dist/styles/color/palettes/default.css'); +@import url('https://early.webawesome.com/webawesome@3.0.0-beta.1/dist/styles/color/palettes/elegant.css'); html, body { @@ -12,11 +13,7 @@ body { margin: 0; } -:where(:root), -:host, -.wa-theme-nyaabooru { - --wa-icon-family: classic; - --wa-icon-variant: light; +:root { --wa-border-radius-scale: 0.5; --wa-border-width-scale: 1; --wa-space-scale: 0.75; diff --git a/resources/views/components/layouts/app.blade.php b/resources/views/components/layouts/app.blade.php index 598c516..fae976e 100644 --- a/resources/views/components/layouts/app.blade.php +++ b/resources/views/components/layouts/app.blade.php @@ -1,12 +1,16 @@ - + @vite(['resources/css/app.css', 'resources/js/app.js']) - + + @livewireStyles {{ $title ?? 'Untitled' }} ~ {{ config('app.name') }} @@ -18,7 +22,9 @@