Merge pull request #219 from jitendra-webkul/master

Issue #202 fixed

Author: jitendra-webkul

packages/Webkul/Admin/src/Resources/views/activities/edit.blade.php

@@ -72,7 +72,7 @@
                                 <textarea class="control" id="activity-comment" name="comment">{{ old('comment') ?: $activity->comment }}</textarea>
                             </div>
 
-                            <div class="form-group" :class="[errors.has('schedule_from') || errors.has('schedule_to') ? 'has-error' : '']">
+                            <div class="form-group date" :class="[errors.has('schedule_from') || errors.has('schedule_to') ? 'has-error' : '']">
                                 <label for="schedule_from" class="required">{{ __('admin::app.activities.schedule') }}</label>
 
                                 <div class="input-group">

packages/Webkul/Admin/src/Resources/views/common/custom-attributes/edit/phone.blade.php

@@ -21,7 +21,7 @@
                         </select>
                     </div>
 
-                    <i class="icon trash-icon" v-if="emails.length > 1" @click="removePhone(contactNumber)"></i>
+                    <i class="icon trash-icon" v-if="contactNumbers.length > 1" @click="removePhone(contactNumber)"></i>
 
                     <span class="control-error" v-if="errors.has('{!! $formScope ?? '' !!}' + attribute['code'] + '[' + index + '][value]')">
                         @{{ errors.first('{!! $formScope ?? '' !!}' + attribute['code'] + '[' + index + '][value]') }}

packages/Webkul/Admin/src/Resources/views/leads/view.blade.php

@@ -508,7 +508,7 @@ class="stage"
                         <textarea class="control" id="activity-comment" name="comment">{{ old('comment') }}</textarea>
                     </div>
 
-                    <div class="form-group" :class="[errors.has('activity-form.schedule_from') || errors.has('activity-form.schedule_to') ? 'has-error' : '']">
+                    <div class="form-group date" :class="[errors.has('activity-form.schedule_from') || errors.has('activity-form.schedule_to') ? 'has-error' : '']">
                         <label for="schedule_from" class="required">{{ __('admin::app.leads.schedule') }}</label>
 
                         <div class="input-group">

packages/Webkul/UI/publishable/assets/css/ui.css

@@ -1,6 +1,6 @@
 {
     "/js/ui.js": "/js/ui.js?id=04e2fdebe8621c6953e2",
-    "/css/ui.css": "/css/ui.css?id=7855a0b66e35a635a196",
+    "/css/ui.css": "/css/ui.css?id=ad7b8afe7e2ca780abcb",
     "/images/add-icon.svg": "/images/add-icon.svg?id=9135b4e0e1c239c36981",
     "/images/align-justify-icon.svg": "/images/align-justify-icon.svg?id=ee8d48e636b80417a884",
     "/images/arrow-down-icon.svg": "/images/arrow-down-icon.svg?id=7b5c03f96be72c9a0bef",

packages/Webkul/UI/publishable/assets/mix-manifest.json

@@ -883,7 +883,7 @@ h5 {
                 pointer-events: none;
                 position: absolute;
                 right: 10px;
-                top: 50%;
+                top: 29px;
                 margin-top: -9px;
             }
         }
@@ -995,11 +995,11 @@ h5 {
         > .date-container,
         > .datetime-container {
             &:not(:first-child) {
-                padding-left: 10px;
+                margin-left: 10px;
             }
 
             &:not(:last-child) {
-                padding-right: 10px;
+                margin-right: 10px;
             }
         }