Merge pull request krayin#1653 from suraj-webkul/cosole-erros

fix div can not be child of p.
Contenda-Team · Oct 1, 2024 · 552d95e · 552d95e
2 parents 66ad95b + 36c7d33
commit 552d95e
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 24 deletions.
diff --git a/packages/Webkul/Admin/src/Resources/views/components/datagrid/table.blade.php b/packages/Webkul/Admin/src/Resources/views/components/datagrid/table.blade.php
@@ -62,20 +62,20 @@ class="icon-checkbox-outline cursor-pointer rounded-md text-2xl text-gray-500 pe
 
                             <!-- Columns -->
                             <template v-for="column in available.columns">
-                                <p
+                                <div
                                     class="flex items-center gap-1.5 break-words"
                                     :class="{'cursor-pointer select-none hover:text-gray-800 dark:hover:text-white': column.sortable}"
                                     @click="sort(column)"
                                     v-if="column.visibility"
-                                >
+                                > 
                                     <p v-html="column.label"></p>
 
                                     <i
                                         class="align-text-bottom text-base text-gray-600 dark:text-gray-300"
                                         :class="[applied.sort.order === 'asc' ? 'icon-down-stat': 'icon-up-stat']"
                                         v-if="column.index == applied.sort.column"
                                     ></i>
-                                </p>
+                                </div>
                             </template>
 
                             <!-- Actions -->

diff --git a/packages/Webkul/Admin/src/Resources/views/components/datagrid/toolbar/filter.blade.php b/packages/Webkul/Admin/src/Resources/views/components/datagrid/toolbar/filter.blade.php
@@ -777,13 +777,11 @@ class="flex flex-col gap-2"
                                                                             @{{ getFormattedDates(column) }}
                                                                         </span>
 
-                                                                        <div>
-                                                                            <span
-                                                                                class="icon-cross-large cursor-pointer text-lg text-white ltr:ml-1.5 rtl:mr-1.5"
-                                                                                @click="removeSavedFilterColumnValue(column, appliedColumnValue)"
-                                                                            >
-                                                                            </span>
-                                                                        </div>
+                                                                        <span
+                                                                            class="icon-cross-large cursor-pointer text-lg text-white ltr:ml-1.5 rtl:mr-1.5"
+                                                                            @click="removeSavedFilterColumnValue(column, appliedColumnValue)"
+                                                                        >
+                                                                        </span>
                                                                     </p>
                                                                 </template>
 
@@ -799,13 +797,11 @@ class="flex items-center rounded bg-gray-600 px-2 py-1 font-semibold text-white"
                                                                                 @{{ appliedColumnValue }}
                                                                             </span>
 
-                                                                            <div>
-                                                                                <span
-                                                                                    class="icon-cross-large cursor-pointer text-lg text-white ltr:ml-1.5 rtl:mr-1.5"
-                                                                                    @click="removeSavedFilterColumnValue(column, appliedColumnValue)"
-                                                                                >
-                                                                                </span>
-                                                                            </div>
+                                                                            <span
+                                                                                class="icon-cross-large cursor-pointer text-lg text-white ltr:ml-1.5 rtl:mr-1.5"
+                                                                                @click="removeSavedFilterColumnValue(column, appliedColumnValue)"
+                                                                            >
+                                                                            </span>
                                                                         </p>
                                                                     </template>
 
@@ -816,13 +812,11 @@ class="icon-cross-large cursor-pointer text-lg text-white ltr:ml-1.5 rtl:mr-1.5"
                                                                                 @{{ column.value }}
                                                                             </span>
 
-                                                                            <div>
-                                                                                <span
-                                                                                    class="icon-cross-large cursor-pointer text-lg text-white ltr:ml-1.5 rtl:mr-1.5"
-                                                                                    @click="removeSavedFilterColumnValue(column, column.value)"
-                                                                                >
-                                                                                </span>
-                                                                            </div>
+                                                                            <span
+                                                                                class="icon-cross-large cursor-pointer text-lg text-white ltr:ml-1.5 rtl:mr-1.5"
+                                                                                @click="removeSavedFilterColumnValue(column, column.value)"
+                                                                            >
+                                                                            </span>
                                                                         </p>
                                                                     </template>
                                                                 </template>