Merge branch 'master' into form-elements

resources/assets/js/components/AkauntingMoney.vue

@@ -1,5 +1,5 @@
 <template>
-    <div v-if="! rowInput" class="form-group"
+    <div v-if="! rowInput"
         :class="[{'has-error': error}, {'required': required}, {'readonly': readonly}, {'disabled': disabled}, col]">
 
         <label v-if="title" :for="name" class="text-black text-sm font-medium">
@@ -27,7 +27,7 @@
             {{ title }}
         </label>
 
-        <div v-if="icon" class="input-group input-group-merge" :class="group_class">
+        <div v-if="icon" :class="group_class">
             <div v-if="icon" class="input-group-prepend">
                 <span class="input-group-text">
                     <i :class="'fa fa-' + icon"></i>