diff --git a/resources/views/components/frameworks/bootstrap5/footer.blade.php b/resources/views/components/frameworks/bootstrap5/footer.blade.php index 3b41ceb7..143f034d 100644 --- a/resources/views/components/frameworks/bootstrap5/footer.blade.php +++ b/resources/views/components/frameworks/bootstrap5/footer.blade.php @@ -4,7 +4,7 @@ count(data_get($setUp, 'footer.perPageValues')) > 1 && blank(data_get($setUp, 'footer.pagination'))) @includeIf(data_get($setUp, 'footer.includeViewOnBottom')) diff --git a/src/Themes/Bootstrap5.php b/src/Themes/Bootstrap5.php index 344c0634..b0f0c76f 100644 --- a/src/Themes/Bootstrap5.php +++ b/src/Themes/Bootstrap5.php @@ -49,8 +49,10 @@ public function cols(): array public function footer(): array { return [ - 'view' => $this->root() . '.footer', - 'select' => '', + 'view' => $this->root() . '.footer', + 'select' => '', + 'footer' => 'mt-50 pb-1 w-100 align-items-end px-1 d-flex flex-wrap justify-content-sm-center justify-content-md-between', + 'footer_with_pagination' => '', ]; } diff --git a/src/Themes/Tailwind.php b/src/Themes/Tailwind.php index 33697152..01529e55 100644 --- a/src/Themes/Tailwind.php +++ b/src/Themes/Tailwind.php @@ -42,8 +42,10 @@ public function table(): array public function footer(): array { return [ - 'view' => $this->root() . '.footer', - 'select' => 'appearance-none !bg-none focus:ring-primary-600 focus-within:focus:ring-primary-600 focus-within:ring-primary-600 dark:focus-within:ring-primary-600 flex rounded-md ring-1 transition focus-within:ring-2 dark:ring-pg-primary-600 dark:text-pg-primary-300 text-gray-600 ring-gray-300 dark:bg-pg-primary-800 bg-white dark:placeholder-pg-primary-400 rounded-md border-0 bg-transparent py-1.5 px-4 pr-7 ring-0 placeholder:text-gray-400 focus:outline-none sm:text-sm sm:leading-6 w-auto', + 'view' => $this->root() . '.footer', + 'select' => 'appearance-none !bg-none focus:ring-primary-600 focus-within:focus:ring-primary-600 focus-within:ring-primary-600 dark:focus-within:ring-primary-600 flex rounded-md ring-1 transition focus-within:ring-2 dark:ring-pg-primary-600 dark:text-pg-primary-300 text-gray-600 ring-gray-300 dark:bg-pg-primary-800 bg-white dark:placeholder-pg-primary-400 rounded-md border-0 bg-transparent py-1.5 px-4 pr-7 ring-0 placeholder:text-gray-400 focus:outline-none sm:text-sm sm:leading-6 w-auto', + 'footer' => 'border-x border-b rounded-b-lg border-b border-pg-primary-200 dark:bg-pg-primary-700 dark:border-pg-primary-600', + 'footer_with_pagination' => 'md:flex md:flex-row w-full items-center py-3 bg-white overflow-y-auto pl-2 pr-2 relative dark:bg-pg-primary-900', ]; } diff --git a/src/functions.php b/src/functions.php index 2112993c..02fe48e0 100644 --- a/src/functions.php +++ b/src/functions.php @@ -50,8 +50,10 @@ function once(callable $callback): mixed } if (!function_exists('theme_style')) { - function theme_style(array $theme, string $name): string + function theme_style(array $theme, string $name, ?string $default = null): string { - return strval(data_get($theme, str($name)->append('.0')) ?? data_get($theme, $name)); + return strval( + data_get($theme, str($name)->append('.0')) ?? data_get($theme, $name, $default) + ); } }