github
/
element
mirror of https://github.com/ElemeFE/element
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #59 from eleme/feat/next-row 

Update Row and Col
pull/2/head
cinwell.li 2016-08-12 18:29:24 +08:00 committed by GitHub
parent 5ce5efde29 05bfb6332b
commit 05081a7424
2 changed files with 9 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
packages/col/src/col.vue
View File

@ -1,12 +1,13 @@
<template> <template>
<div class="el-col" <div
class="el-col"
:class="[ :class="[
'el-col-' + span, 'el-col-' + span,
offset ? 'el-col-offset-' + offset : '', offset ? 'el-col-offset-' + offset : '',
pull ? 'el-col-pull-' + pull : '', pull ? 'el-col-pull-' + pull : '',
push ? 'el-col-push-' + push : '' push ? 'el-col-push-' + push : ''
]" ]"
v-bind:style="style" :style="style"
> >
<slot></slot> <slot></slot>
</div> </div>
@ -20,21 +21,16 @@
type: Number, type: Number,
required: true required: true
}, },
offset: { offset: Number,
type: Number pull: Number,
}, push: Number
pull: {
type: Number
},
push: {
type: Number
}
}, },
computed: { computed: {
gutter() { gutter() {
return this.$parent.gutter; return this.$parent.gutter;
}, },
style() { style() {
var ret = {}; var ret = {};
@ -45,11 +41,6 @@
return ret; return ret;
} }
},
data() {
return {
};
} }
}; };
</script> </script>

11
packages/row/src/row.vue
View File

@ -1,5 +1,5 @@
<template> <template>
<div class="el-row" v-bind:style="style"> <div class="el-row" :style="style">
<slot></slot> <slot></slot>
</div> </div>
</template> </template>
@ -8,9 +8,7 @@
name: 'ElRow', name: 'ElRow',
props: { props: {
gutter: { gutter: Number
type: Number
}
}, },
computed: { computed: {
@ -24,11 +22,6 @@
return ret; return ret;
} }
},
data() {
return {
};
} }
}; };
</script> </script>