diff --git a/resources/views/components/pagination.blade.php b/resources/views/components/pagination.blade.php index 633b31b24..9425023c7 100644 --- a/resources/views/components/pagination.blade.php +++ b/resources/views/components/pagination.blade.php @@ -47,14 +47,10 @@ @else @if ($this->paginationIsEnabled && $this->isPaginationMethod('standard') && $currentRows->lastPage() > 1)
-
- {{ $currentRows->links('livewire-tables::specific.bootstrap-4.pagination') }} -
-
$isBootstrap4, - "text-md-end" => $isBootstrap5, + "col-12 col-md-6 text-center text-muted small", + "text-md-left" => $isBootstrap4, + "text-md-start" => $isBootstrap5, ])> @if($this->showPaginationDetails) {{ __($localisationPath.'Showing') }} @@ -66,17 +62,17 @@ {{ __($localisationPath.'results') }} @endif
+ +
+ {{ $currentRows->links('livewire-tables::specific.bootstrap-4.pagination') }} +
@elseif ($this->paginationIsEnabled && $this->isPaginationMethod('simple'))
-
- {{ $currentRows->links('livewire-tables::specific.bootstrap-4.simple-pagination') }} -
-
$isBootstrap4, - "text-md-end" => $isBootstrap5, + "text-md-left" => $isBootstrap4, + "text-md-start" => $isBootstrap5, ])> @if($this->showPaginationDetails) {{ __($localisationPath.'Showing') }} @@ -85,6 +81,10 @@ {{ $currentRows->count() ? $currentRows->lastItem() : 0 }} @endif
+ +
+ {{ $currentRows->links('livewire-tables::specific.bootstrap-4.simple-pagination') }} +
@elseif ($this->paginationIsEnabled && $this->isPaginationMethod('cursor'))
diff --git a/resources/views/components/table/td.blade.php b/resources/views/components/table/td.blade.php index 9fae459d3..5041e248c 100644 --- a/resources/views/components/table/td.blade.php +++ b/resources/views/components/table/td.blade.php @@ -18,7 +18,7 @@ 'hidden' => $isTailwind && $column && $column->shouldCollapseAlways(), 'hidden md:table-cell' => $isTailwind && $column && $column->shouldCollapseOnMobile(), 'hidden lg:table-cell' => $isTailwind && $column && $column->shouldCollapseOnTablet(), - '' => $isBootstrap && ($customAttributes['default'] ?? true), + 'small' => $isBootstrap && ($customAttributes['default'] ?? true), 'd-none' => $isBootstrap && $column && $column->shouldCollapseAlways(), 'd-none d-md-table-cell' => $isBootstrap && $column && $column->shouldCollapseOnMobile(), 'd-none d-lg-table-cell' => $isBootstrap && $column && $column->shouldCollapseOnTablet(), diff --git a/resources/views/components/table/td/plain.blade.php b/resources/views/components/table/td/plain.blade.php index d47872a03..5e6103cb0 100644 --- a/resources/views/components/table/td/plain.blade.php +++ b/resources/views/components/table/td/plain.blade.php @@ -19,7 +19,7 @@ merge($customAttributes) ->class([ - '' => $customAttributes['default'] ?? true, + 'small' => $customAttributes['default'] ?? true, 'd-none' => $column && $column->shouldCollapseAlways(), 'd-none d-md-table-cell' => $column && $column->shouldCollapseOnMobile(), 'd-none d-lg-table-cell' => $column && $column->shouldCollapseOnTablet(), diff --git a/resources/views/components/table/th.blade.php b/resources/views/components/table/th.blade.php index 3562f4cf6..bbdccdbb9 100644 --- a/resources/views/components/table/th.blade.php +++ b/resources/views/components/table/th.blade.php @@ -18,7 +18,7 @@ 'hidden' => $isTailwind && $column->shouldCollapseAlways(), 'hidden md:table-cell' => $isTailwind && $column->shouldCollapseOnMobile(), 'hidden lg:table-cell' => $isTailwind && $column->shouldCollapseOnTablet(), - '' => $isBootstrap && ($customThAttributes['default'] ?? true), + 'small' => $isBootstrap && ($customThAttributes['default'] ?? true), 'd-none' => $isBootstrap && $column->shouldCollapseAlways(), 'd-none d-md-table-cell' => $isBootstrap && $column->shouldCollapseOnMobile(), 'd-none d-lg-table-cell' => $isBootstrap && $column->shouldCollapseOnTablet(), diff --git a/resources/views/components/tools/filters/date.blade.php b/resources/views/components/tools/filters/date.blade.php index b32b38bbb..27cf95d05 100644 --- a/resources/views/components/tools/filters/date.blade.php +++ b/resources/views/components/tools/filters/date.blade.php @@ -9,7 +9,7 @@ ->class([ 'block w-full rounded-md shadow-sm transition duration-150 ease-in-out focus:ring focus:ring-opacity-50' => $isTailwind && ($filterInputAttributes['default-styling'] ?? true), 'border-gray-300 focus:border-indigo-300 focus:ring-indigo-200 dark:bg-gray-800 dark:text-white dark:border-gray-600' => $isTailwind && ($filterInputAttributes['default-colors'] ?? true), - 'form-control' => $isBootstrap, + 'form-control form-control-sm' => $isBootstrap, ]) ->except(['default-styling','default-colors']) }} /> diff --git a/resources/views/components/tools/filters/datetime.blade.php b/resources/views/components/tools/filters/datetime.blade.php index 74d80455a..7517a1039 100644 --- a/resources/views/components/tools/filters/datetime.blade.php +++ b/resources/views/components/tools/filters/datetime.blade.php @@ -10,7 +10,7 @@ ->class([ 'block w-full rounded-md shadow-sm transition duration-150 ease-in-out focus:ring focus:ring-opacity-50' => $isTailwind && ($filterInputAttributes['default-styling'] ?? true), 'border-gray-300 focus:border-indigo-300 focus:ring-indigo-200 dark:bg-gray-800 dark:text-white dark:border-gray-600' => $isTailwind && ($filterInputAttributes['default-colors'] ?? true), - 'form-control' => $isBootstrap, + 'form-control form-control-sm' => $isBootstrap, ]) ->except(['default-styling','default-colors']) }} /> diff --git a/resources/views/components/tools/filters/number.blade.php b/resources/views/components/tools/filters/number.blade.php index 0c8e766cb..25b08d7cf 100644 --- a/resources/views/components/tools/filters/number.blade.php +++ b/resources/views/components/tools/filters/number.blade.php @@ -10,7 +10,7 @@ ->class([ 'block w-full rounded-md shadow-sm transition duration-150 ease-in-out focus:ring focus:ring-opacity-50' => $isTailwind && ($filterInputAttributes['default-styling'] ?? true), 'border-gray-300 focus:border-indigo-300 focus:ring-indigo-200 dark:bg-gray-800 dark:text-white dark:border-gray-600' => $isTailwind && ($filterInputAttributes['default-colors'] ?? true), - 'form-control' => $isBootstrap, + 'form-control form-control-sm' => $isBootstrap, ]) ->except(['default-styling','default-colors']) }} /> diff --git a/resources/views/components/tools/filters/select.blade.php b/resources/views/components/tools/filters/select.blade.php index 9a0ca9683..0f0f53f56 100644 --- a/resources/views/components/tools/filters/select.blade.php +++ b/resources/views/components/tools/filters/select.blade.php @@ -10,8 +10,8 @@ ->class([ 'block w-full transition duration-150 ease-in-out rounded-md shadow-sm focus:ring focus:ring-opacity-50' => $isTailwind && ($filterInputAttributes['default-styling'] ?? true), 'border-gray-300 focus:border-indigo-300 focus:ring-indigo-200 dark:bg-gray-800 dark:text-white dark:border-gray-600' => $isTailwind && ($filterInputAttributes['default-colors'] ?? true), - 'form-control' => $isBootstrap4 && ($filterInputAttributes['default-styling'] ?? true), - 'form-select' => $isBootstrap5 && ($filterInputAttributes['default-styling'] ?? true), + 'form-control form-control-sm' => $isBootstrap4 && ($filterInputAttributes['default-styling'] ?? true), + 'form-select form-select-sm' => $isBootstrap5 && ($filterInputAttributes['default-styling'] ?? true), ]) ->except(['default-styling','default-colors']) }}> diff --git a/resources/views/components/tools/filters/text-field.blade.php b/resources/views/components/tools/filters/text-field.blade.php index 74d80455a..7517a1039 100644 --- a/resources/views/components/tools/filters/text-field.blade.php +++ b/resources/views/components/tools/filters/text-field.blade.php @@ -10,7 +10,7 @@ ->class([ 'block w-full rounded-md shadow-sm transition duration-150 ease-in-out focus:ring focus:ring-opacity-50' => $isTailwind && ($filterInputAttributes['default-styling'] ?? true), 'border-gray-300 focus:border-indigo-300 focus:ring-indigo-200 dark:bg-gray-800 dark:text-white dark:border-gray-600' => $isTailwind && ($filterInputAttributes['default-colors'] ?? true), - 'form-control' => $isBootstrap, + 'form-control form-control-sm' => $isBootstrap, ]) ->except(['default-styling','default-colors']) }} /> diff --git a/resources/views/components/tools/toolbar/items/bulk-actions.blade.php b/resources/views/components/tools/toolbar/items/bulk-actions.blade.php index 12ea6bb18..dde8fc3ee 100644 --- a/resources/views/components/tools/toolbar/items/bulk-actions.blade.php +++ b/resources/views/components/tools/toolbar/items/bulk-actions.blade.php @@ -16,7 +16,7 @@ {{ $attributes->merge($this->getBulkActionsButtonAttributes) ->class([ - 'btn dropdown-toggle d-block d-md-inline' => $isBootstrap && ($this->getBulkActionsButtonAttributes['default-styling'] ?? true), + 'btn btn-sm dropdown-toggle d-block d-md-inline' => $isBootstrap && ($this->getBulkActionsButtonAttributes['default-styling'] ?? true), 'border-gray-300 bg-white text-gray-700 hover:bg-gray-50 focus:border-indigo-300 focus:ring-indigo-200 dark:bg-gray-700 dark:text-white dark:border-gray-600 dark:hover:bg-gray-600' => $isTailwind && ($this->getBulkActionsButtonAttributes['default-colors'] ?? true), 'inline-flex justify-center w-full rounded-md border shadow-sm px-4 py-2 text-sm font-medium focus:ring focus:ring-opacity-50' => $isTailwind && ($this->getBulkActionsButtonAttributes['default-styling'] ?? true), diff --git a/resources/views/components/tools/toolbar/items/column-select.blade.php b/resources/views/components/tools/toolbar/items/column-select.blade.php index 388b9171c..815b758e0 100644 --- a/resources/views/components/tools/toolbar/items/column-select.blade.php +++ b/resources/views/components/tools/toolbar/items/column-select.blade.php @@ -122,7 +122,7 @@ class="inline-flex items-center px-2 py-1 disabled:opacity-50 disabled:cursor-wa {{ $attributes->merge($this->getColumnSelectButtonAttributes()) ->class([ - 'btn dropdown-toggle d-block w-100 d-md-inline' => $this->getColumnSelectButtonAttributes()['default-styling'], + 'btn btn-sm dropdown-toggle d-block w-100 d-md-inline' => $this->getColumnSelectButtonAttributes()['default-styling'], ]) ->except(['default-styling', 'default-colors']) }} diff --git a/resources/views/components/tools/toolbar/items/filter-button.blade.php b/resources/views/components/tools/toolbar/items/filter-button.blade.php index 9340e7691..e0de32954 100644 --- a/resources/views/components/tools/toolbar/items/filter-button.blade.php +++ b/resources/views/components/tools/toolbar/items/filter-button.blade.php @@ -23,7 +23,7 @@