wip

nox-software · Sep 21, 2024 · 9e62a82 · 9e62a82
1 parent 37c6f0a
commit 9e62a82
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/dist/flux-lite.min.js b/dist/flux-lite.min.js
diff --git a/dist/manifest.json b/dist/manifest.json
@@ -1,3 +1,3 @@
 {
-  "/flux.js": "ce95da9d"
+  "/flux.js": "6b6c72d9"
 }
diff --git a/stubs/resources/views/flux/button-or-link.blade.php b/stubs/resources/views/flux/button-or-link.blade.php
@@ -5,7 +5,7 @@
 ])
 
 @php
-$current = $current === null ? ($href ? request()->is(trim($href, '/')) : false) : $current;
+$current = $current === null ? ($href ? request()->is($href === '/' ? '/' : trim($href, '/')) : false) : $current;
 @endphp
 
 <?php if ($href): ?>

diff --git a/stubs/resources/views/flux/menu/index.blade.php b/stubs/resources/views/flux/menu/index.blade.php
@@ -1,6 +1,6 @@
 @php
 $classes = Flux::classes()
-    ->add('min-w-48 p-[.3125rem]')
+    ->add('[:where(&)]:min-w-48 p-[.3125rem]')
     ->add('rounded-lg shadow-sm')
     ->add('border border-zinc-200 dark:border-zinc-600')
     ->add('bg-white dark:bg-zinc-700')

diff --git a/stubs/resources/views/flux/navmenu/index.blade.php b/stubs/resources/views/flux/navmenu/index.blade.php
@@ -1,6 +1,6 @@
 @php
 $classes = Flux::classes()
-    ->add('min-w-48 p-[.3125rem]')
+    ->add('[:where(&)]:min-w-48 p-[.3125rem]')
     ->add('rounded-lg shadow-sm')
     ->add('border border-zinc-200 dark:border-zinc-600')
     ->add('bg-white dark:bg-zinc-700')
-Original file line number
+Diff line change
@@ Expand Up / @@ -5,7 +5,7 @@ @@
     ])
     @php
-    $current = $current === null ? ($href ? request()->is(trim($href, '/')) : false) : $current;
+    $current = $current === null ? ($href ? request()->is($href === '/' ? '/' : trim($href, '/')) : false) : $current;
     @endphp
     <?php if ($href): ?>
@@ Expand Down @@