blackteay/vant
1
0
Fork 0
mirror of https://gitee.com/vant-contrib/vant.git synced 2025-04-06 03:57:59 +08:00
Code Issues Projects Releases Wiki Activity

add border

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.eslintignore
View File

@ -1,3 +1,4 @@
lib/ lib/
dist/ dist/
node_modules/ node_modules/
build/

3
packages/button/src/button.pcss
View File

@ -28,16 +28,19 @@
@modifier default { @modifier default {
color: $button-default-color; color: $button-default-color;
background-color: $button-default-background-color; background-color: $button-default-background-color;
border: 1px solid $button-default-border-color;
} }
@modifier primary { @modifier primary {
color: $button-primary-color; color: $button-primary-color;
background-color: $button-primary-background-color; background-color: $button-primary-background-color;
border: 1px solid $button-primary-border-color;
} }
@modifier danger { @modifier danger {
color: $button-danger-color; color: $button-danger-color;
background-color: $button-danger-background-color; background-color: $button-danger-background-color;
border: 1px solid $button-danger-border-color;
} }
@modifier large { @modifier large {

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

@ -32,15 +32,13 @@
* @example * @example
* <o2-button size="large" type="primary">按钮</o2-button> * <o2-button size="large" type="primary">按钮</o2-button>
*/ */
const allowedSize = ['mini', 'small', 'normal', 'large'];
const allowedType = ['default', 'danger', 'primary'];
export default { export default {
name: 'o2-button', name: 'o2-button',
methods: {
handleClick(e) {
this.$emit('click', e);
}
},
props: { props: {
disabled: Boolean, disabled: Boolean,
loading: Boolean, loading: Boolean,
@ -49,23 +47,14 @@ export default {
type: String, type: String,
default: 'default', default: 'default',
validator(value) { validator(value) {
return [ return allowedSize.indexOf(value) > -1;
'default',
'danger',
'primary'
].indexOf(value) > -1;
} }
}, },
size: { size: {
type: String, type: String,
default: 'normal', default: 'normal',
validator(value) { validator(value) {
return [ return allowedType.indexOf(value) > -1;
'mini',
'small',
'normal',
'large'
].indexOf(value) > -1;
} }
} }
} }

11
packages/zenui/src/common/var.pcss
View File

@ -17,12 +17,15 @@ $c-blue: #38f;
$c-background: #f8f8f8; $c-background: #f8f8f8;
/* 按钮颜色 */ /* 按钮颜色 */
$button-default-color: $c-white; $button-primary-color: $c-white;
$button-default-background-color: $c-green-wx; $button-primary-background-color: $c-green-wx;
$button-primary-color: $c-black; $button-primary-border-color: #0a0;
$button-primary-background-color: $c-white; $button-default-color: $c-black;
$button-default-background-color: $c-white;
$button-default-border-color: #bbb;
$button-danger-color: $c-white; $button-danger-color: $c-white;
$button-danger-background-color: #f44; $button-danger-background-color: #f44;
$button-danger-border-color: #e33;
:root{ :root{