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

Merge branch 'master' of gitlab.qima-inc.com:fe/zanui-vue

Browse Source
This commit is contained in:
cookfront 2017-03-02 16:07:11 +08:00
commit 50f2fd88e2
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docs/index.js
View File

@ -38,7 +38,6 @@ router.afterEach(route => {
Vue.nextTick(() => { Vue.nextTick(() => {
document.body.scrollTop = indexScrollTop; document.body.scrollTop = indexScrollTop;
}); });
} }
}); });

6
packages/button/src/button.js
View File

@ -61,9 +61,9 @@ export default {
'zan-button--' + type, 'zan-button--' + type,
'zan-button--' + size, 'zan-button--' + size,
{ {
'is-disabled': disabled, 'z-button--disabled': disabled,
'is-loading': loading, 'z-button--loading': loading,
'is-block': block 'z-button--block': block
} }
]} ]}
onClick={this.handleClick} onClick={this.handleClick}

4
packages/zanui-css/src/button.css
View File

@ -75,13 +75,13 @@
font-size: 10px; font-size: 10px;
} }
@when disabled { @m disabled {
color: $button-disabled-color; color: $button-disabled-color;
background-color: $button-disabled-background-color; background-color: $button-disabled-background-color;
border: 1px solid $button-disabled-border-color; border: 1px solid $button-disabled-border-color;
} }
@when block { @m block {
display: block; display: block;
} }
} }

1
packages/zanui-css/src/button_group.css
View File

@ -2,6 +2,7 @@
display: inline-block; display: inline-block;
box-sizing: border-box; box-sizing: border-box;
padding-right: 10px; padding-right: 10px;
vertical-align: middle;
&:last-child { &:last-child {
padding-right: 0; padding-right: 0;
} }