Merge branch 'master' into form-elements

resources/assets/js/components/Inputs/BaseInput.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="form-group" :class="[
+  <div :class="[
        {'has-error': error},
        formClasses
        ]">
@@ -10,7 +10,7 @@
       </label>
     </slot>
     <div class="relative" :class="[
-       {'input-group input-group-merge': hasIcon},
+       {'form-icon': hasIcon},
        {'focused': focused},
        {'input-group-alternative': alternative},
        {'has-label': label || $slots.label},