Skip to content

Commit d0dc39f

Browse files
Merge pull request #1574 from suraj-webkul/inline-component-issues
Inline component issues
2 parents 869415e + 08406a0 commit d0dc39f

File tree

4 files changed

+13
-7
lines changed

4 files changed

+13
-7
lines changed

packages/Webkul/Admin/src/Resources/views/components/attributes/view/date.blade.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<x-admin::form.control-group.controls.inline.date
22
::name="'{{ $attribute->code }}'"
3-
::value="'{{ $value }}'"
3+
::value="'{{ $value->format('Y-m-d') }}'"
44
rules="required"
55
position="left"
66
:label="$attribute->name"

packages/Webkul/Admin/src/Resources/views/components/datagrid/toolbar/filter.blade.php

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -251,12 +251,14 @@ class="cursor-pointer rounded-md border px-3 py-2 text-center text-sm font-mediu
251251
>
252252
</p>
253253
254-
<x-admin::flat-picker.date ::allow-input="false">
254+
<x-admin::flat-picker.date
255+
::allow-input="false"
256+
>
255257
<input
256258
type="date"
257259
:name="`${column.index}[from]`"
258260
value=""
259-
class="flex min-h-[39px] w-full rounded-md border px-3 py-2 text-sm text-gray-600 transition-all hover:border-gray-400 dark:border-gray-800 dark:bg-gray-900 dark:text-gray-300 dark:hover:border-gray-400"
261+
class="flex min-h-[39px] w-full rounded-md border px-3 py-2 text-sm text-gray-600 transition-all hover:border-gray-400 dark:border-gray-800 dark:bg-gray-900 dark:text-gray-300 dark:hover:border-gray-400 ltr:pr-8 rtl:pl-8"
260262
:placeholder="column.label"
261263
:ref="`${column.index}[from]`"
262264
@change="addFilter(
@@ -272,7 +274,7 @@ class="flex min-h-[39px] w-full rounded-md border px-3 py-2 text-sm text-gray-60
272274
type="date"
273275
:name="`${column.index}[to]`"
274276
value=""
275-
class="flex min-h-[39px] w-full rounded-md border px-3 py-2 text-sm text-gray-600 transition-all hover:border-gray-400 dark:border-gray-800 dark:bg-gray-900 dark:text-gray-300 dark:hover:border-gray-400"
277+
class="flex min-h-[39px] w-full rounded-md border px-3 py-2 text-sm text-gray-600 transition-all hover:border-gray-400 dark:border-gray-800 dark:bg-gray-900 dark:text-gray-300 dark:hover:border-gray-400 ltr:pr-8 rtl:pl-8"
276278
:placeholder="column.label"
277279
:ref="`${column.index}[from]`"
278280
@change="addFilter(

packages/Webkul/Admin/src/Resources/views/components/form/control-group/controls/inline/date.blade.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ class="relative flex w-full flex-col ltr:[&>span>i]:right-14 rtl:[&>span>i]:left
7070
type="date"
7171
::id="name"
7272
::name="name"
73-
class="text-normal py-1 ltr:pr-16 rtl:pl-16"
73+
class="text-normal py-1 ltr:pr-20 rtl:pl-20"
7474
::rules="rules"
7575
::label="label"
7676
::placeholder="placeholder"

packages/Webkul/Admin/src/Resources/views/leads/index/kanban/filter.blade.php

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,12 @@
1818
<!-- Drawer Toggler -->
1919
<x-slot:toggle>
2020
<div class="relative flex cursor-pointer items-center rounded-md bg-sky-100 px-4 py-[9px] font-semibold text-sky-600 dark:bg-brandColor dark:text-white">
21-
<span>
22-
@lang('admin::app.leads.index.kanban.toolbar.filters.filter')
21+
@lang('admin::app.leads.index.kanban.toolbar.filters.filter')
22+
23+
<span
24+
class="absolute right-2 top-2 h-1.5 w-1.5 rounded-full bg-sky-600 dark:bg-white"
25+
v-if="hasAnyAppliedColumn()"
26+
>
2327
</span>
2428
</div>
2529
</x-slot>

0 commit comments

Comments
 (0)