Skip to content

Commit a696bf1

Browse files
committed
Merge branch 'main' into components
2 parents a2b0602 + 600834e commit a696bf1

File tree

4 files changed

+6
-5
lines changed

4 files changed

+6
-5
lines changed

app/Models/User.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,8 @@ public function initials(): string
5454
{
5555
return Str::of($this->name)
5656
->explode(' ')
57-
->map(fn (string $name) => Str::of($name)->substr(0, 1))
57+
->take(2)
58+
->map(fn ($word) => Str::substr($word, 0, 1))
5859
->implode('');
5960
}
6061
}

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
],
5555
"dev": [
5656
"Composer\\Config::disableProcessTimeout",
57-
"npx concurrently -c \"#93c5fd,#c4b5fd,#fb7185,#fdba74\" \"php artisan serve\" \"php artisan queue:listen --tries=1\" \"php artisan pail --timeout=0\" \"npm run dev\" --names=server,queue,logs,vite"
57+
"npx concurrently -c \"#93c5fd,#c4b5fd,#fb7185,#fdba74\" \"php artisan serve\" \"php artisan queue:listen --tries=1\" \"php artisan pail --timeout=0\" \"npm run dev\" --names=server,queue,logs,vite --kill-others"
5858
],
5959
"test": [
6060
"@php artisan config:clear --ansi",

resources/views/components/app-logo.blade.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
<x-app-logo-icon class="size-5 fill-current text-white dark:text-black" />
33
</div>
44
<div class="ms-1 grid flex-1 text-start text-sm">
5-
<span class="mb-0.5 truncate leading-none font-semibold">Laravel Starter Kit</span>
5+
<span class="mb-0.5 truncate leading-tight font-semibold">Laravel Starter Kit</span>
66
</div>

resources/views/components/layouts/app/sidebar.blade.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,11 @@
3030
</flux:navlist>
3131

3232
<!-- Desktop User Menu -->
33-
<flux:dropdown position="bottom" align="start">
33+
<flux:dropdown class="hidden lg:block" position="bottom" align="start">
3434
<flux:profile
3535
:name="auth()->user()->name"
3636
:initials="auth()->user()->initials()"
37-
icon-trailing="chevrons-up-down"
37+
icon:trailing="chevrons-up-down"
3838
/>
3939

4040
<flux:menu class="w-[220px]">

0 commit comments

Comments
 (0)