Merge pull request #62 from takielias/fix-top-right-drowdown

Fix for #54
takielias · Apr 25, 2024 · d7a8c33 · d7a8c33
2 parents 305fd17 + 0308a7f
commit d7a8c33
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/resources/views/auth/layout.blade.php b/resources/views/auth/layout.blade.php
@@ -6,12 +6,20 @@
     <meta http-equiv="X-UA-Compatible" content="ie=edge"/>
     <meta name="csrf-token" content="{{ csrf_token() }}">
     <title>@yield('title')</title>
-    <!-- CSS files -->
-    @vite('resources/js/app.js')
+
+    <!-- CSS/JS files -->
+    @if(config('tablar','vite'))
+        @vite('resources/js/app.js')
+    @endif
+    {{-- Custom Stylesheets (post Tablar) --}}
+    @yield('tablar_css')
+
 </head>
 <body class=" border-top-wide border-primary d-flex flex-column">
 <div class="page page-center">
     @yield('content')
 </div>
-</body>
+
+@yield('tablar_js')
+
 </html>
diff --git a/resources/views/master.blade.php b/resources/views/master.blade.php
@@ -15,7 +15,7 @@
         @yield('title_postfix', config('tablar.title_postfix', ''))
     </title>
 
-    <!-- CSS files -->
+    <!-- CSS/JS files -->
     @if(config('tablar','vite'))
         @vite('resources/js/app.js')
     @endif