Merge branch 'webspilka-patch-1'

fourstacks · Feb 2, 2019 · 6d482f0 · 6d482f0
2 parents 3b9abaa + e7c2994
commit 6d482f0
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 15 deletions.
diff --git a/dist/css/field.css b/dist/css/field.css
diff --git a/dist/js/field.js b/dist/js/field.js
diff --git a/resources/js/components/rows/SubFieldRow.vue b/resources/js/components/rows/SubFieldRow.vue
@@ -15,7 +15,7 @@
                 <path d="M20.281 20.656c0 0.391-0.156 0.781-0.438 1.062l-2.125 2.125c-0.281 0.281-0.672 0.438-1.062 0.438s-0.781-0.156-1.062-0.438l-4.594-4.594-4.594 4.594c-0.281 0.281-0.672 0.438-1.062 0.438s-0.781-0.156-1.062-0.438l-2.125-2.125c-0.281-0.281-0.438-0.672-0.438-1.062s0.156-0.781 0.438-1.062l4.594-4.594-4.594-4.594c-0.281-0.281-0.438-0.672-0.438-1.062s0.156-0.781 0.438-1.062l2.125-2.125c0.281-0.281 0.672-0.438 1.062-0.438s0.781 0.156 1.062 0.438l4.594 4.594 4.594-4.594c0.281-0.281 0.672-0.438 1.062-0.438s0.781 0.156 1.062 0.438l2.125 2.125c0.281 0.281 0.438 0.672 0.438 1.062s-0.156 0.781-0.438 1.062l-4.594 4.594 4.594 4.594c0.281 0.281 0.438 0.672 0.438 1.062z"></path>
             </svg>
         </button>
-        <div class="row-inputs" :class="formLayout">
+        <div class="row-inputs flex-wrap" :class="formLayout">
             <component
                 v-for="(subField, index) in field.sub_fields"
                 :is="`${subField.type}-sub-field`"
@@ -66,11 +66,12 @@
                     ? subField.width
                     : 'flex-1';
 
-                return (this.field.display_stacked)
-                    ? this.formLayout
-                    : `${this.formLayout} ${width}`
+                if(this.field.display_stacked){
+                	return this.formLayout;
+                }
+                return `${this.formLayout} ${width} mb-2`
             },
         }
 
     }
-</script>
+</script>
diff --git a/resources/sass/field.scss b/resources/sass/field.scss
@@ -64,6 +64,8 @@
 
         &.-horizontal{
             justify-content: space-between;
+            margin-left: -0.5rem;
+            margin-right: -0.5rem;
         }
 
         &.-vertical{
@@ -82,14 +84,6 @@
         }
         &.-horizontal{
             padding: 0 0.5rem;
-
-            &:first-child{
-                margin-left: -0.5rem;
-            }
-
-            &:last-child{
-                margin-right: -0.5rem;
-            }
         }
     }