Skip to content

Commit 86ed0ed

Browse files
shivendra-webkulshivendra-webkul
committed
fixed tax attribute and webform pages
1 parent fd712dc commit 86ed0ed

File tree

5 files changed

+54
-57
lines changed

5 files changed

+54
-57
lines changed

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

Lines changed: 2 additions & 4 deletions
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/settings/attributes/edit.blade.php‎

Lines changed: 27 additions & 28 deletions
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/tags/index.blade.php‎

Lines changed: 7 additions & 7 deletions
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/web-forms/create.blade.php‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ class="primary-button"
5151
5252
<!-- Submit success actions -->
5353
<x-admin::form.control-group>
54-
<x-admin::form.control-group.label class="required !text-gray-600">
54+
<x-admin::form.control-group.label class="required">
5555
@lang('admin::app.settings.webforms.create.submit-success-action')
5656
</x-admin::form.control-group.label>
5757
@@ -92,7 +92,7 @@ class="rounded-l-none"
9292
9393
<!-- Create Leads -->
9494
<x-admin::form.control-group>
95-
<x-admin::form.control-group.label class="required !text-gray-600">
95+
<x-admin::form.control-group.label class="required">
9696
@lang('admin::app.settings.webforms.create.create-lead')
9797
</x-admin::form.control-group.label>
9898
@@ -130,7 +130,7 @@ class="peer sr-only"
130130
value="{{ old('background_color') ?? '#F7F8F9' }}"
131131
>
132132
<x-admin::form.control-group>
133-
<x-admin::form.control-group.label class="!text-gray-600">
133+
<x-admin::form.control-group.label class="">
134134
@lang('admin::app.settings.webforms.create.backgroud-color')
135135
</x-admin::form.control-group.label>
136136
@@ -151,7 +151,7 @@ class="peer sr-only"
151151
value="{{ old('form_background_color') ?? '#FFFFFF' }}"
152152
>
153153
<x-admin::form.control-group>
154-
<x-admin::form.control-group.label class="!text-gray-600">
154+
<x-admin::form.control-group.label class="">
155155
@lang('admin::app.settings.webforms.create.form-background-color')
156156
</x-admin::form.control-group.label>
157157
@@ -174,7 +174,7 @@ class="peer sr-only"
174174
value="{{ old('form_title_color') ?? '#263238' }}"
175175
>
176176
<x-admin::form.control-group>
177-
<x-admin::form.control-group.label class="!text-gray-600">
177+
<x-admin::form.control-group.label class="">
178178
@lang('admin::app.settings.webforms.create.form-title-color')
179179
</x-admin::form.control-group.label>
180180
@@ -197,7 +197,7 @@ class="peer sr-only"
197197
value="{{ old('form_submit_button_color') ?? '#0E90D9' }}"
198198
>
199199
<x-admin::form.control-group>
200-
<x-admin::form.control-group.label class="!text-gray-600">
200+
<x-admin::form.control-group.label class="">
201201
@lang('admin::app.settings.webforms.create.form-submit-btn-color')
202202
</x-admin::form.control-group.label>
203203
@@ -220,7 +220,7 @@ class="peer sr-only"
220220
value="{{ old('attribute_label_color') ?? '#546E7A' }}"
221221
>
222222
<x-admin::form.control-group>
223-
<x-admin::form.control-group.label class="!text-gray-600">
223+
<x-admin::form.control-group.label class="">
224224
@lang('admin::app.settings.webforms.create.attribute-label-color')
225225
</x-admin::form.control-group.label>
226226
@@ -316,7 +316,7 @@ class="whitespace-no-wrap flex cursor-pointer items-center justify-between gap-1
316316
<!-- Attribute Name -->
317317
<x-admin::table.td>
318318
<x-admin::form.control-group>
319-
<x-admin::form.control-group.label class="!text-gray-600">
319+
<x-admin::form.control-group.label class="">
320320
@{{ element?.name + ' (' + element?.attribute?.entity_type + ')' }}
321321
</x-admin::form.control-group.label>
322322
@@ -398,7 +398,7 @@ class="icon-delete cursor-pointer text-2xl"
398398
<x-slot:content>
399399
<!-- Title -->
400400
<x-admin::form.control-group>
401-
<x-admin::form.control-group.label class="required !text-gray-600">
401+
<x-admin::form.control-group.label class="required">
402402
@lang('admin::app.settings.webforms.create.title')
403403
</x-admin::form.control-group.label>
404404
@@ -417,7 +417,7 @@ class="icon-delete cursor-pointer text-2xl"
417417
418418
<!-- Description -->
419419
<x-admin::form.control-group>
420-
<x-admin::form.control-group.label class="!text-gray-600">
420+
<x-admin::form.control-group.label class="">
421421
@lang('admin::app.settings.webforms.create.description')
422422
</x-admin::form.control-group.label>
423423
@@ -435,7 +435,7 @@ class="icon-delete cursor-pointer text-2xl"
435435
436436
<!-- Submit button label -->
437437
<x-admin::form.control-group>
438-
<x-admin::form.control-group.label class="required !text-gray-600">
438+
<x-admin::form.control-group.label class="required">
439439
@lang('admin::app.settings.webforms.create.submit-button-label')
440440
</x-admin::form.control-group.label>
441441
@@ -462,7 +462,7 @@ class="icon-delete cursor-pointer text-2xl"
462462
id="v-color-picker"
463463
>
464464
<x-admin::form.control-group>
465-
<x-admin::form.control-group.label class="required !text-gray-600">
465+
<x-admin::form.control-group.label class="required">
466466
@{{ title }}
467467
</x-admin::form.control-group.label>
468468

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ class="primary-button"
6666
6767
<!-- Method and URL endpoint -->
6868
<x-admin::form.control-group>
69-
<x-admin::form.control-group.label class="required !text-gray-600">
69+
<x-admin::form.control-group.label class="required">
7070
@lang('admin::app.settings.webhooks.edit.url-and-parameters')
7171
</x-admin::form.control-group.label>
7272
@@ -129,7 +129,7 @@ class="rounded-l-none"
129129
<hr class="my-4 w-full"/>
130130
131131
<x-admin::form.control-group>
132-
<x-admin::form.control-group.label class="required !text-gray-600">
132+
<x-admin::form.control-group.label class="required">
133133
@lang('admin::app.settings.webhooks.edit.body')
134134
</x-admin::form.control-group.label>
135135
@@ -268,7 +268,7 @@ class="whitespace-no-wrap flex cursor-pointer items-center justify-between gap-1
268268
<x-slot:content>
269269
<!-- Name -->
270270
<x-admin::form.control-group>
271-
<x-admin::form.control-group.label class="required !text-gray-600">
271+
<x-admin::form.control-group.label class="required">
272272
@lang('admin::app.settings.webhooks.edit.name')
273273
</x-admin::form.control-group.label>
274274
@@ -287,7 +287,7 @@ class="whitespace-no-wrap flex cursor-pointer items-center justify-between gap-1
287287
288288
<!-- Entity Type -->
289289
<x-admin::form.control-group>
290-
<x-admin::form.control-group.label class="required !text-gray-600">
290+
<x-admin::form.control-group.label class="required">
291291
@lang('admin::app.settings.webhooks.edit.entity-type')
292292
</x-admin::form.control-group.label>
293293
@@ -312,7 +312,7 @@ class="whitespace-no-wrap flex cursor-pointer items-center justify-between gap-1
312312
313313
<!-- Description -->
314314
<x-admin::form.control-group>
315-
<x-admin::form.control-group.label class="required !text-gray-600">
315+
<x-admin::form.control-group.label class="required">
316316
@lang('admin::app.settings.webhooks.edit.description')
317317
</x-admin::form.control-group.label>
318318
@@ -339,7 +339,7 @@ class="whitespace-no-wrap flex cursor-pointer items-center justify-between gap-1
339339
id="v-key-and-value-template"
340340
>
341341
<x-admin::form.control-group class="my-2">
342-
<x-admin::form.control-group.label class="required !text-gray-600">
342+
<x-admin::form.control-group.label class="required">
343343
@{{ title }}
344344
</x-admin::form.control-group.label>
345345

0 commit comments

Comments
 (0)