add border

This commit is contained in:
niunai
2017-02-15 17:47:36 +08:00
parent 2fed755d7c
commit 72a60dc3e1
4 changed files with 17 additions and 21 deletions
+3
View File
@@ -28,16 +28,19 @@
@modifier default {
color: $button-default-color;
background-color: $button-default-background-color;
border: 1px solid $button-default-border-color;
}
@modifier primary {
color: $button-primary-color;
background-color: $button-primary-background-color;
border: 1px solid $button-primary-border-color;
}
@modifier danger {
color: $button-danger-color;
background-color: $button-danger-background-color;
border: 1px solid $button-danger-border-color;
}
@modifier large {
+6 -17
View File
@@ -32,15 +32,13 @@
* @example
* <o2-button size="large" type="primary">按钮</o2-button>
*/
const allowedSize = ['mini', 'small', 'normal', 'large'];
const allowedType = ['default', 'danger', 'primary'];
export default {
name: 'o2-button',
methods: {
handleClick(e) {
this.$emit('click', e);
}
},
props: {
disabled: Boolean,
loading: Boolean,
@@ -49,23 +47,14 @@ export default {
type: String,
default: 'default',
validator(value) {
return [
'default',
'danger',
'primary'
].indexOf(value) > -1;
return allowedSize.indexOf(value) > -1;
}
},
size: {
type: String,
default: 'normal',
validator(value) {
return [
'mini',
'small',
'normal',
'large'
].indexOf(value) > -1;
return allowedType.indexOf(value) > -1;
}
}
}