Merge pull request #353 from rappasoft/develop

v1.10.1

Author: rappasoft

CHANGELOG.md

@@ -4,6 +4,12 @@ All notable changes to `laravel-livewire-tables` will be documented in this file
 
 ## [Unreleased]
 
+## [1.10.1] - 2021-06-20
+
+### Changed
+
+- Fixed Tailwind column popup on reorder
+
 ## [1.10.0] - 2021-06-20
 
 **This release requires re-publishing of assets.**
@@ -386,7 +392,8 @@ All notable changes to `laravel-livewire-tables` will be documented in this file
 
 - Initial release
 
-[Unreleased]: https://github.com/rappasoft/laravel-livewire-tables/compare/v1.10.0...development
+[Unreleased]: https://github.com/rappasoft/laravel-livewire-tables/compare/v1.10.1...development
+[1.10.1]: https://github.com/rappasoft/laravel-livewire-tables/compare/v1.10.0...v1.10.1
 [1.10.0]: https://github.com/rappasoft/laravel-livewire-tables/compare/v1.9.0...v1.10.0
 [1.9.0]: https://github.com/rappasoft/laravel-livewire-tables/compare/v1.8.0...v1.9.0
 [1.8.0]: https://github.com/rappasoft/laravel-livewire-tables/compare/v1.7.1...v1.8.0

resources/views/tailwind/datatable.blade.php

@@ -26,10 +26,10 @@
                         @include('livewire-tables::tailwind.includes.filters')
                     </div>
 
-                    <div class="md:space-x-2 md:flex md:items-center">
-                        @include('livewire-tables::tailwind.includes.bulk-actions')
-                        @include('livewire-tables::tailwind.includes.column-select')
-                        @include('livewire-tables::tailwind.includes.per-page')
+                    <div class="md:flex md:items-center">
+                        <div>@include('livewire-tables::tailwind.includes.bulk-actions')</div>
+                        <div>@include('livewire-tables::tailwind.includes.column-select')</div>
+                        <div>@include('livewire-tables::tailwind.includes.per-page')</div>
                     </div>
                 </div>
 

resources/views/tailwind/includes/column-select.blade.php

@@ -1,5 +1,5 @@
 @if ($columnSelect)
-    <div class="w-full md:w-auto mb-4 md:mb-0">
+    <div class="w-full md:w-auto mb-4 md:mb-0 md:ml-2">
         <div
             x-data="{ open: false }"
             @keydown.window.escape="open = false"

resources/views/tailwind/includes/per-page.blade.php

@@ -1,5 +1,5 @@
 @if ($paginationEnabled && $showPerPage)
-    <div class="w-full md:w-auto">
+    <div class="w-full md:w-auto ml-0 md:ml-2">
         <select
             wire:model="perPage"
             id="perPage"