Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix div can not be child of p. #1653

Merged
merged 1 commit into from
Oct 1, 2024
Merged

fix div can not be child of p. #1653

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions packages/Webkul/Admin/src/Resources/views/components/datagrid/table.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 -->
Expand Down
36 changes: 15 additions & 21 deletions packages/Webkul/Admin/src/Resources/views/components/datagrid/toolbar/filter.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand All @@ -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>

Expand All @@ -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>
Expand Down
Loading