Skip to content

Commit d731407

Browse files
committed
Fixed UI Issue...
1 parent 6c7dbca commit d731407

File tree

11 files changed

+720
-713
lines changed

11 files changed

+720
-713
lines changed

composer.lock

Lines changed: 618 additions & 611 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/Webkul/Admin/src/Resources/assets/css/app.css

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -598,7 +598,7 @@
598598
background: transparent;
599599
background-image: url("data:image/svg+xml;utf8,<svg fill='black' height='24' viewBox='0 0 24 24' width='24' xmlns='http://www.w3.org/2000/svg'><path d='M7 10l5 5 5-5z'/><path d='M0 0h24v24H0z' fill='none'/></svg>");
600600
background-repeat: no-repeat;
601-
background-position-x: calc(100% - 10px);
601+
background-position-x: calc(100% - 5px);
602602
background-position-y: 50%;
603603
}
604604

@@ -607,7 +607,7 @@
607607
}
608608

609609
[dir="rtl"] .custom-select {
610-
background-position-x: calc(100% - (100% - 10px));
610+
background-position-x: calc(100% - (100% - 5px));
611611
}
612612

613613
.draggable-ghost {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ class="flex w-full items-center overflow-hidden rounded-md border text-sm text-g
175175
name="{{ $name }}"
176176
v-bind="field"
177177
:class="[errors.length ? 'border border-red-500' : '']"
178-
{{ $attributes->except(['value', ':value', 'v-model', 'rules', ':rules', 'label', ':label'])->merge(['class' => 'custom-select w-full rounded border border-gray-200 px-2.5 py-2 text-sm font-normal text-gray-800 transition-all hover:border-gray-400 focus:border-gray-400 dark:border-gray-800 dark:bg-gray-900 dark:text-gray-300 dark:hover:border-gray-400']) }}
178+
{{ $attributes->except(['value', ':value', 'v-model', 'rules', ':rules', 'label', ':label'])->merge(['class' => 'custom-select w-full rounded border border-gray-200 pl-2.5 pr-8 py-2 text-sm font-normal text-gray-800 transition-all hover:border-gray-400 focus:border-gray-400 dark:border-gray-800 dark:bg-gray-900 dark:text-gray-300 dark:hover:border-gray-400']) }}
179179
>
180180
{{ $slot }}
181181
</select>

packages/Webkul/Admin/src/Resources/views/configuration/field-type.blade.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ class="text-gray-600 dark:text-gray-300"
153153
:name="name"
154154
v-bind="data.field"
155155
:class="[data.errors.length ? 'border border-red-500' : '']"
156-
class="custom-select w-full rounded-md border bg-white px-3 py-2.5 text-sm font-normal 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"
156+
class="custom-select w-full rounded-md border bg-white py-2.5 pl-2.5 pr-3 text-sm font-normal 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"
157157
>
158158
<option
159159
v-for="option in field.options"
@@ -180,7 +180,7 @@ class="custom-select w-full rounded-md border bg-white px-3 py-2.5 text-sm font-
180180
:name="`${name}[]`"
181181
v-bind="data.field"
182182
:class="[data.errors.length ? 'border border-red-500' : '']"
183-
class="custom-select w-full rounded-md border bg-white px-3 py-2.5 text-sm font-normal 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"
183+
class="custom-select w-full rounded-md border bg-white py-2.5 pl-2.5 pr-3 text-sm font-normal 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"
184184
multiple
185185
>
186186
<option

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -345,7 +345,7 @@ class="text-md flex max-w-max items-center gap-2 text-brandColor"
345345
<select
346346
:name="['conditions[' + index + '][attribute]']"
347347
:id="['conditions[' + index + '][attribute]']"
348-
class="custom-select min:w-1/3 flex h-10 w-1/3 rounded-md border bg-white px-3 py-2.5 text-sm font-normal 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 max-sm:max-w-full max-sm:flex-auto"
348+
class="custom-select min:w-1/3 flex h-10 w-1/3 rounded-md border bg-white py-2.5 pl-2.5 pr-3 text-sm font-normal 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 max-sm:max-w-full max-sm:flex-auto"
349349
v-model="condition.attribute"
350350
>
351351
<option
@@ -359,7 +359,7 @@ class="custom-select min:w-1/3 flex h-10 w-1/3 rounded-md border bg-white px-3 p
359359
<select
360360
:name="['conditions[' + index + '][operator]']"
361361
:id="['conditions[' + index + '][operator]']"
362-
class="custom-select min:w-1/3 inline-flex h-10 w-1/3 items-center justify-between gap-x-1 rounded-md border bg-white px-3 py-2.5 text-sm font-normal 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 max-sm:max-w-full max-sm:flex-auto"
362+
class="custom-select min:w-1/3 inline-flex h-10 w-1/3 items-center justify-between gap-x-1 rounded-md border bg-white py-2.5 pl-2.5 pr-3 text-sm font-normal 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 max-sm:max-w-full max-sm:flex-auto"
363363
v-model="condition.operator"
364364
>
365365
<option
@@ -452,7 +452,7 @@ class="min:w-1/3 flex w-full rounded-md border px-3 py-2 text-sm text-gray-600 t
452452
<template v-if="matchedAttribute.type == 'boolean'">
453453
<select
454454
:name="['conditions[' + index + '][value]']"
455-
class="custom-select inline-flex h-10 w-1/3 items-center justify-between gap-x-1 rounded-md border bg-white px-3 py-2.5 text-sm font-normal 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 max-sm:max-w-full max-sm:flex-auto"
455+
class="custom-select inline-flex h-10 w-1/3 items-center justify-between gap-x-1 rounded-md border bg-white py-2.5 pl-2.5 pr-3 text-sm font-normal 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 max-sm:max-w-full max-sm:flex-auto"
456456
v-model="condition.value"
457457
>
458458
<option value="1">
@@ -476,7 +476,7 @@ class="custom-select inline-flex h-10 w-1/3 items-center justify-between gap-x-1
476476
<template v-if="! matchedAttribute.lookup_type">
477477
<select
478478
:name="['conditions[' + index + '][value]']"
479-
class="custom-select inline-flex h-10 w-1/3 items-center justify-between gap-x-1 rounded-md border bg-white px-3 py-2.5 text-sm font-normal 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"
479+
class="custom-select inline-flex h-10 w-1/3 items-center justify-between gap-x-1 rounded-md border bg-white py-2.5 pl-2.5 pr-3 text-sm font-normal 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"
480480
v-model="condition.value"
481481
>
482482
<option
@@ -566,11 +566,11 @@ class="custom-select flex h-10 w-full rounded-md border bg-white px-3 py-2.5 tex
566566
<x-admin::table.td >
567567
<div class="flex w-full justify-between gap-4">
568568
<template v-if="matchedAction && matchedAction.attributes">
569-
<!-- Mattched Attribute -->
569+
<!-- Matched Attribute -->
570570
<select
571571
:name="['actions[' + index + '][attribute]']"
572572
:id="['actions[' + index + '][attribute]']"
573-
class="custom-select inline-flex h-10 w-full items-center justify-between gap-x-1 rounded-md border bg-white px-3 py-2.5 text-sm font-normal 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 max-sm:max-w-full max-sm:flex-auto"
573+
class="custom-select inline-flex h-10 w-full items-center justify-between gap-x-1 rounded-md border bg-white py-2.5 pl-2.5 pr-3 text-sm font-normal 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 max-sm:max-w-full max-sm:flex-auto"
574574
v-model="action.attribute"
575575
>
576576
<option
@@ -690,7 +690,7 @@ class="flex min-h-[39px] w-full rounded-md border px-3 py-2 text-sm text-gray-60
690690
<template v-if="matchedAttribute.type == 'boolean'">
691691
<select
692692
:name="['actions[' + index + '][value]']"
693-
class="custom-select inline-flex h-10 w-full items-center justify-between gap-x-1 rounded-md border bg-white px-3 py-2.5 text-sm font-normal 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 max-sm:max-w-full max-sm:flex-auto"
693+
class="custom-select inline-flex h-10 w-full items-center justify-between gap-x-1 rounded-md border bg-white py-2.5 pl-2.5 pr-3 text-sm font-normal 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 max-sm:max-w-full max-sm:flex-auto"
694694
v-model="action.value"
695695
>
696696
<option value="1">
@@ -715,7 +715,7 @@ class="custom-select inline-flex h-10 w-full items-center justify-between gap-x-
715715
<template v-if="! matchedAttribute.lookup_type">
716716
<select
717717
:name="['actions[' + index + '][value]']"
718-
class="custom-select inline-flex h-10 w-full items-center justify-between gap-x-1 rounded-md border bg-white px-3 py-2.5 text-sm font-normal 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"
718+
class="custom-select inline-flex h-10 w-full items-center justify-between gap-x-1 rounded-md border bg-white py-2.5 pl-2.5 pr-3 text-sm font-normal 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"
719719
v-model="action.value"
720720
>
721721
<option
@@ -765,7 +765,7 @@ class="inline-flex h-20 w-full items-center justify-between gap-x-1 rounded-md b
765765
<template v-if="matchedAction && matchedAction.options">
766766
<select
767767
:name="`actions[${index}][value]`"
768-
class="custom-select flex h-10 w-full rounded-md border bg-white px-3 py-2.5 text-sm font-normal 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 max-sm:max-w-full max-sm:flex-auto"
768+
class="custom-select flex h-10 w-full rounded-md border bg-white py-2.5 pl-2.5 pr-3 text-sm font-normal 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 max-sm:max-w-full max-sm:flex-auto"
769769
v-model="action.value"
770770
>
771771
<option

0 commit comments

Comments
 (0)