Merge branch 'v2' of https://github.com/jdf2e/nutui into v2

ljb1010 · Mar 4, 2019 · 9bb48d3 · 9bb48d3
2 parents 4fe911a + 24888f7
commit 9bb48d3
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/src/packages/skeleton/layout/skeleton-column.vue b/src/packages/skeleton/layout/skeleton-column.vue
@@ -4,6 +4,7 @@
         :style="{
             width:width,
             padding:padding,
+            'align-items':center
         }"    
     >
         <slot></slot>
@@ -26,6 +27,10 @@
             padding:{
                 type:String,
                 default:"0 0 0 0"
+            },
+            center:{
+                type:String,
+                default:"flex-start"
             }
         },
     }

diff --git a/src/packages/skeleton/layout/skeleton-row.vue b/src/packages/skeleton/layout/skeleton-row.vue
@@ -4,6 +4,7 @@
         :style="{
             width:width,
             padding:padding,
+            'justify-content': center
         }"    
     >
         <slot></slot>
@@ -21,11 +22,15 @@
         props:{
             width:{
                 type:String,
-                default:"100%"
+                default:"auto"
             },
             padding:{
                 type:String,
                 default:"0 0 0 0"
+            },
+            center:{
+                type:String,
+                default:"flex-start"
             }
         },
     }