Merge 5.x

Power-Components · Aug 16, 2024 · f5e906a · f5e906a
2 parents 2248fa2 + 26e6449
commit f5e906a
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/resources/views/components/cols.blade.php b/resources/views/components/cols.blade.php
@@ -20,6 +20,15 @@
         }
 
         if (data_get($column, 'fixedOnResponsive')) {
+        if (data_get($column, 'isAction') &&
+            in_array(
+                    \PowerComponents\LivewirePowerGrid\Responsive::ACTIONS_COLUMN_NAME,
+                    data_get($this->setUp, 'responsive.fixedColumns')
+            )) {
+            $isFixedOnResponsive = true;
+        }
+
+        if ($column->fixedOnResponsive) {
             $isFixedOnResponsive = true;
         }
     }

diff --git a/resources/views/components/icons/filter.blade.php b/resources/views/components/icons/filter.blade.php
@@ -4,7 +4,6 @@
     viewBox="0 0 24 24"
     stroke-width="1.5"
     stroke="currentColor"
-    class="w-4 h-4"
 >
     <path
         stroke-linecap="round"

diff --git a/resources/views/components/icons/search.blade.php b/resources/views/components/icons/search.blade.php
@@ -1,12 +1,11 @@
 <svg
-    {{ $attributes->merge(['class' => 'h-5 w-5']) }}
+    {{ $attributes->merge(['class' => 'h-5 w-5 dark:text-gray-300 text-gray-400']) }}
     fill="none"
     stroke="currentColor"
     stroke-linecap="round"
     stroke-linejoin="round"
     stroke-width="2"
     viewBox="0 0 24 24"
-    class="w-6 h-6 dark:text-gray-300 text-gray-400"
 >
     <path d="M21 21l-6-6m2-5a7 7 0 11-14 0 7 7 0 0114 0z"></path>
 </svg>