Skip to content

Commit ec94eba

Browse files
benjpaddockbenjpaddock
authored
Merge pull request #1407 from shivendra-webkul/dark-mode
Fix minor issues and dark mode and ltr
2 parents 72d53f8 + 029f849 commit ec94eba

File tree

10 files changed

+95
-90
lines changed

10 files changed

+95
-90
lines changed

‎packages/Webkul/Admin/src/Resources/views/components/form/control-group/control.blade.php

+2-4
Original file line numberDiff line numberDiff line change
@@ -230,8 +230,7 @@ class="hidden"
230230
type="radio"
231231
name="{{ $name }}"
232232
v-bind="field"
233-
class="peer sr-only"
234-
{{ $attributes->except(['rules', 'label', ':label', 'key', ':key']) }}
233+
{{ $attributes->except(['rules', 'label', ':label', 'key', ':key'])->merge(['class' => 'peer sr-only']) }}
235234
/>
236235

237236
<v-checked-handler
@@ -243,8 +242,7 @@ class="hidden"
243242
</v-field>
244243

245244
<label
246-
class="icon-radio-normal peer-checked:icon-radio-selected cursor-pointer text-2xl peer-checked:text-blue-600"
247-
{{ $attributes->except(['value', ':value', 'v-model', 'rules', ':rules', 'label', ':label', 'key', ':key']) }}
245+
{{ $attributes->except(['value', ':value', 'v-model', 'rules', ':rules', 'label', ':label', 'key', ':key'])->merge(['class' => 'icon-radio-normal peer-checked:icon-radio-selected cursor-pointer text-2xl peer-checked:text-blue-600']) }}
248246
>
249247
</label>
250248

‎packages/Webkul/Admin/src/Resources/views/components/shimmer/pipelines/kanban.blade.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<div class="flex gap-4 overflow-auto max-xl:flex-wrap">
22
@for ($i = 1; $i <= 6; $i++)
3-
<div class="flex h-[380px] min-w-[275px] max-w-[275px] flex-col justify-between rounded-lg bg-white">
3+
<div class="flex h-[380px] min-w-[275px] max-w-[275px] flex-col justify-between rounded-lg bg-white dark:bg-gray-900">
44
<!-- Stage Header -->
55
<div class="flex flex-col gap-6 px-4 py-3">
66
<!-- Stage Title and Action -->
@@ -23,7 +23,7 @@
2323
</div>
2424
</div>
2525

26-
<div class="flex items-center gap-2 border-t p-2">
26+
<div class="flex items-center gap-2 p-2">
2727
<div class="shimmer h-[26px] w-[26px] rounded-md"></div>
2828

2929
<div class="shimmer h-5 w-20"></div>

‎packages/Webkul/Admin/src/Resources/views/settings/attributes/edit.blade.php

+27-28
Original file line numberDiff line numberDiff line change
@@ -482,45 +482,44 @@ class="cursor-pointer text-xs font-medium text-gray-600 dark:text-gray-300"
482482
@toggle="listenModel"
483483
ref="addOptionsRow"
484484
>
485-
<!-- Modal Header !-->
485+
<!-- Modal Header -->
486486
<x-slot:header>
487487
<p class="text-lg font-bold text-gray-800 dark:text-white">
488488
@lang('admin::app.settings.attributes.edit.add-option')
489489
</p>
490490
</x-slot>
491491
492-
<!-- Modal Content !-->
492+
<!-- Modal Content -->
493493
<x-slot:content>
494-
<!-- Hidden Id Input -->
495-
<x-admin::form.control-group.control
496-
type="hidden"
497-
name="id"
498-
/>
494+
<!-- Hidden Id Input -->
495+
<x-admin::form.control-group.control
496+
type="hidden"
497+
name="id"
498+
/>
499+
500+
<x-admin::form.control-group.control
501+
type="hidden"
502+
name="isNew"
503+
::value="optionIsNew"
504+
/>
505+
506+
<!-- Admin Input -->
507+
<x-admin::form.control-group class="mb-2.5 w-full">
508+
<x-admin::form.control-group.label class="required">
509+
@lang('admin::app.settings.attributes.edit.option-name')
510+
</x-admin::form.control-group.label>
499511
500512
<x-admin::form.control-group.control
501-
type="hidden"
502-
name="isNew"
503-
::value="optionIsNew"
513+
type="text"
514+
name="name"
515+
rules="required"
516+
:label="trans('admin::app.settings.attributes.edit.option-name')"
517+
:placeholder="trans('admin::app.settings.attributes.edit.option-name')"
518+
ref="inputAdmin"
504519
/>
505520
506-
<!-- Admin Input -->
507-
<x-admin::form.control-group class="mb-2.5 w-full">
508-
<x-admin::form.control-group.label class="required">
509-
@lang('admin::app.settings.attributes.edit.option-name')
510-
</x-admin::form.control-group.label>
511-
512-
<x-admin::form.control-group.control
513-
type="text"
514-
name="name"
515-
rules="required"
516-
:label="trans('admin::app.settings.attributes.edit.option-name')"
517-
:placeholder="trans('admin::app.settings.attributes.edit.option-name')"
518-
ref="inputAdmin"
519-
/>
520-
521-
<x-admin::form.control-group.error control-name="name" />
522-
</x-admin::form.control-group>
523-
</div>
521+
<x-admin::form.control-group.error control-name="name" />
522+
</x-admin::form.control-group>
524523
</x-slot>
525524
526525
<!-- Modal Footer -->

‎packages/Webkul/Admin/src/Resources/views/settings/pipelines/create.blade.php

+6-6
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ class="primary-button"
3737
</div>
3838
</div>
3939

40-
<div class="flex gap-4 border-t px-4 py-2 align-top max-sm:flex-wrap">
40+
<div class="flex gap-4 border-t border-gray-200 px-4 py-2 align-top dark:border-gray-800 max-sm:flex-wrap">
4141
<!-- Name -->
4242
<x-admin::form.control-group>
4343
<x-admin::form.control-group.label class="required">
@@ -129,12 +129,12 @@ class="flex gap-4"
129129
::class="{ draggable: isDragable(element) }"
130130
class="flex gap-4 overflow-x-auto"
131131
>
132-
<div class="flex min-w-[275px] max-w-[275px] flex-col justify-between rounded-lg bg-white">
132+
<div class="flex min-w-[275px] max-w-[275px] flex-col justify-between rounded-lg bg-white dark:bg-gray-900">
133133
<!-- Stage Crad -->
134134
<div class="flex flex-col gap-6 px-4 py-3">
135135
<!-- Stage Title and Action -->
136136
<div class="flex items-center justify-between">
137-
<span class="py-1 font-medium">
137+
<span class="py-1 font-medium dark:text-gray-300">
138138
@{{ element.name ? element.name : '@lang('admin::app.settings.pipelines.create.newly-added') ' }}
139139
</span>
140140
@@ -199,7 +199,7 @@ class="icon-move cursor-grab rounded-md p-1 text-2xl transition-all hover:bg-gra
199199
</div>
200200
201201
<div
202-
class="flex cursor-pointer items-center gap-2 border-t p-2 text-red-600"
202+
class="flex cursor-pointer items-center gap-2 border-t border-gray-200 p-2 text-red-600 dark:border-gray-800"
203203
@click="removeStage(element)"
204204
v-if="isDragable(element)"
205205
>
@@ -214,11 +214,11 @@ class="flex cursor-pointer items-center gap-2 border-t p-2 text-red-600"
214214
</draggable>
215215
216216
<!-- Add New Stage Card -->
217-
<div class="flex min-h-[400px] min-w-[275px] max-w-[275px] flex-col items-center justify-center gap-1 rounded-lg bg-white">
217+
<div class="flex min-h-[400px] min-w-[275px] max-w-[275px] flex-col items-center justify-center gap-1 rounded-lg bg-white dark:bg-gray-900">
218218
<div class="flex flex-col items-center justify-center gap-6 px-4 py-3">
219219
<div class="grid justify-center justify-items-center gap-3.5 text-center">
220220
<div class="flex flex-col items-center gap-2">
221-
<p class="text-xl font-semibold">
221+
<p class="text-xl font-semibold dark:text-gray-300">
222222
@lang('admin::app.settings.pipelines.create.add-new-stages')
223223
</p>
224224

‎packages/Webkul/Admin/src/Resources/views/settings/pipelines/edit.blade.php

+6-6
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ class="primary-button"
4141
</div>
4242
</div>
4343

44-
<div class="flex gap-4 border-t px-4 py-2 align-top max-sm:flex-wrap">
44+
<div class="flex gap-4 border-t border-gray-200 px-4 py-2 align-top dark:border-gray-800 max-sm:flex-wrap">
4545
<!-- Pipeline Name -->
4646
<x-admin::form.control-group>
4747
<x-admin::form.control-group.label class="required">
@@ -133,11 +133,11 @@ class="flex gap-4"
133133
::class="{ draggable: isDragable(element) }"
134134
class="flex gap-4 overflow-x-auto"
135135
>
136-
<div class="flex min-w-[275px] max-w-[275px] flex-col justify-between rounded-lg bg-white">
136+
<div class="flex min-w-[275px] max-w-[275px] flex-col justify-between rounded-lg bg-white dark:bg-gray-900">
137137
<div class="flex flex-col gap-6 px-4 py-3">
138138
<!-- Stage Title and Action -->
139139
<div class="flex items-center justify-between">
140-
<span class="py-1 font-medium">
140+
<span class="py-1 font-medium dark:text-gray-300">
141141
@{{ element.name ? element.name : 'New Added' }}
142142
</span>
143143
@@ -201,7 +201,7 @@ class="icon-move cursor-grab rounded-md p-1 text-2xl transition-all hover:bg-gra
201201
202202
<!-- Remove Stage -->
203203
<div
204-
class="flex cursor-pointer items-center gap-2 border-t p-2 text-red-600"
204+
class="flex cursor-pointer items-center gap-2 border-t border-gray-200 p-2 text-red-600 dark:border-gray-800"
205205
@click="removeStage(element)"
206206
v-if="isDragable(element)"
207207
>
@@ -215,11 +215,11 @@ class="flex cursor-pointer items-center gap-2 border-t p-2 text-red-600"
215215
</draggable>
216216
217217
<!-- Add New Stage Card -->
218-
<div class="flex min-h-[400px] min-w-[275px] max-w-[275px] flex-col items-center justify-center gap-1 rounded-lg bg-white">
218+
<div class="flex min-h-[400px] min-w-[275px] max-w-[275px] flex-col items-center justify-center gap-1 rounded-lg bg-white dark:bg-gray-900">
219219
<div class="flex flex-col items-center justify-center gap-6 px-4 py-3">
220220
<div class="grid justify-center justify-items-center gap-3.5 text-center">
221221
<div class="flex flex-col items-center gap-2">
222-
<p class="text-xl font-semibold">
222+
<p class="text-xl font-semibold dark:text-gray-300">
223223
@lang('admin::app.settings.pipelines.edit.add-new-stages')
224224
</p>
225225

‎packages/Webkul/Admin/src/Resources/views/settings/tags/index.blade.php

+7-7
Original file line numberDiff line numberDiff line change
@@ -185,11 +185,11 @@ class="cursor-pointer rounded-md p-1.5 text-2xl transition-all hover:bg-gray-200
185185
id="blue-500"
186186
name="color"
187187
value="blue-500"
188-
class="peer absolute z-10 ml-1.5 mt-1.5 cursor-pointer opacity-0"
188+
class="peer absolute left-0 right-3 top-5 z-10 h-full w-full cursor-pointer opacity-0"
189189
/>
190190
<label
191191
for="blue-500"
192-
class="inline-block h-6 w-6 cursor-pointer rounded-full bg-blue-500 shadow-md transition duration-200 ease-in-out peer-checked:border-4 peer-checked:border-solid peer-checked:border-white"
192+
class="block h-6 w-6 cursor-pointer rounded-full bg-blue-500 shadow-md transition duration-200 ease-in-out peer-checked:border-4 peer-checked:border-solid peer-checked:border-white"
193193
>
194194
</label>
195195
</span>
@@ -200,7 +200,7 @@ class="inline-block h-6 w-6 cursor-pointer rounded-full bg-blue-500 shadow-md tr
200200
id="yellow-400"
201201
name="color"
202202
value="yellow-400"
203-
class="peer absolute z-10 ml-1.5 mt-1.5 cursor-pointer opacity-0"
203+
class="peer absolute left-0 right-3 top-5 z-10 h-full w-full cursor-pointer opacity-0"
204204
/>
205205
<label
206206
for="yellow-400"
@@ -215,7 +215,7 @@ class="inline-block h-6 w-6 cursor-pointer rounded-full bg-yellow-400 shadow-md
215215
id="pink-500"
216216
name="color"
217217
value="pink-500"
218-
class="peer absolute z-10 ml-1.5 mt-1.5 cursor-pointer opacity-0"
218+
class="peer absolute left-0 right-3 top-5 z-10 h-full w-full cursor-pointer opacity-0"
219219
/>
220220
<label
221221
for="pink-500"
@@ -230,7 +230,7 @@ class="inline-block h-6 w-6 cursor-pointer rounded-full bg-pink-500 shadow-md tr
230230
id="cyan-500"
231231
name="color"
232232
value="cyan-500"
233-
class="peer absolute z-10 ml-1.5 mt-1.5 cursor-pointer opacity-0"
233+
class="peer absolute left-0 right-3 top-5 z-10 h-full w-full cursor-pointer opacity-0"
234234
/>
235235
<label
236236
for="cyan-500"
@@ -245,7 +245,7 @@ class="inline-block h-6 w-6 cursor-pointer rounded-full bg-cyan-500 shadow-md tr
245245
id="orange-500"
246246
name="color"
247247
value="orange-500"
248-
class="peer absolute z-10 ml-1.5 mt-1.5 cursor-pointer opacity-0"
248+
class="peer absolute left-0 right-3 top-5 z-10 h-full w-full cursor-pointer opacity-0"
249249
/>
250250
<label
251251
for="orange-500"
@@ -260,7 +260,7 @@ class="inline-block h-6 w-6 cursor-pointer rounded-full bg-orange-500 shadow-md
260260
id="green-500"
261261
name="color"
262262
value="green-500"
263-
class="peer absolute z-10 ml-1.5 mt-1.5 cursor-pointer opacity-0"
263+
class="peer absolute left-0 right-3 top-5 z-10 h-full w-full cursor-pointer opacity-0"
264264
/>
265265
<label
266266
for="green-500"

‎packages/Webkul/Admin/src/Resources/views/settings/warehouses/view/locations.blade.php

+20-13
Original file line numberDiff line numberDiff line change
@@ -21,30 +21,37 @@
2121
</x-admin::table.thead.tr>
2222
</x-admin::table.thead>
2323
24-
<x-admin::table.tbody class="rounded-lg border border-gray-200 px-4 py-2 text-sm dark:border-gray-800 dark:bg-gray-900 dark:text-gray-300">
25-
<x-admin::table.tbody.tr v-for="location in locations">
24+
<x-admin::table.tbody >
25+
<x-admin::table.tbody.tr
26+
class="border border-gray-200 dark:border-gray-800 dark:bg-gray-900"
27+
v-for="location in locations"
28+
>
2629
<x-admin::table.td class="dark:text-white">
2730
@{{ location.name }}
2831
</x-admin::table.td>
2932
3033
<x-admin::table.td>
31-
<div
32-
class="cursor-pointer text-brandColor"
33-
@click="remove(location)"
34-
>
35-
@lang('admin::app.settings.warehouses.view.locations.delete')
34+
<div class="inline-block">
35+
<p
36+
@click="remove(location)"
37+
class="cursor-pointer text-brandColor"
38+
>
39+
@lang('admin::app.settings.warehouses.view.locations.delete')
40+
</p>
3641
</div>
3742
</x-admin::table.td>
3843
</x-admin::table.tbody.tr>
3944
</x-admin::table.tbody>
4045
</x-admin::table>
4146
42-
<div
43-
class="cursor-pointer text-brandColor"
44-
@click="openModal()"
45-
>
46-
@lang('admin::app.settings.warehouses.view.locations.add-location')
47-
</div
47+
<div>
48+
<span
49+
class="cursor-pointer text-brandColor"
50+
@click="openModal()"
51+
>
52+
@lang('admin::app.settings.warehouses.view.locations.add-location')
53+
</span>
54+
</div>
4855
4956
<x-admin::form
5057
v-slot="{ meta, errors, handleSubmit }"

0 commit comments

Comments
 (0)