Merge branch 'laravel-12' into 'LivewireViews'

# Conflicts: # resources/views/components/footer.blade.php # resources/views/components/layouts/app.blade.php # routes/web.php
2025-03-15 21:54:38 +00:00
parent efb3f34415 7f877abf1d
commit 5f2ce420c5
7 changed files with 143 additions and 55 deletions
@@ -1,5 +1,7 @@
-  <div class="py-6 px-4 sm:px-6 lg:px-8">
+<div class="bg-zinc-700 w-full border-b border-accent">
+  <div class="container mx-auto py-6 px-4 sm:px-6 lg:px-8">
    <h2 class="font-semibold text-xl text-gray-800 dark:text-gray-200 leading-tight">
      {{ $slot }}
    </h2>
-  </div>
+  </div>
+</div>
@@ -20,16 +20,17 @@
        @livewireStyles
        @fluxAppearance

-        <title>{{ $title . ' | ' . config('app.name', 'Laravel') ??  config('app.name', 'Laravel') }}</title>
+        <title>{{ $title . ' | ' . config('app.name') ?? config('app.name') }}</title>
    </head>
-    <body class="font-sans antialiased">
+    <body class="font-sans antialiased bg-zinc-800">
+        <x-navbar />
+        
        {{ $slot }}
-
-        <x-footer/>
+        
+        <x-footer />
        
-        @stack('modals')
-
        @livewireScripts
        @fluxScripts
+
    </body>
 </html>