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

when to modifier

Browse Source
This commit is contained in:
niunai 2017-03-02 15:53:29 +08:00
parent 1c81270de2
commit b30b98e61c
5 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docs/index.js
View File

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

2
package.json
View File

@ -11,7 +11,7 @@
], ],
"scripts": { "scripts": {
"bootstrap": "npm i --registry=http://registry.npm.qima-inc.com", "bootstrap": "npm i --registry=http://registry.npm.qima-inc.com",
"dev": "npm run bootstrap && npm run build:file && webpack-dev-server --inline --hot --config build/webpack.config.js", "dev": "npm run build:file && webpack-dev-server --inline --hot --config build/webpack.config.js",
"build:file": "node build/bin/build-entry.js", "build:file": "node build/bin/build-entry.js",
"build:utils": "cross-env BABEL_ENV=utils babel src --out-dir lib --ignore src/index.js", "build:utils": "cross-env BABEL_ENV=utils babel src --out-dir lib --ignore src/index.js",
"build:zanui-css": "gulp build --gulpfile packages/zanui-css/gulpfile.js && cp-cli packages/zanui-css/lib lib/zanui-css", "build:zanui-css": "gulp build --gulpfile packages/zanui-css/gulpfile.js && cp-cli packages/zanui-css/lib lib/zanui-css",

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

@ -61,9 +61,9 @@ export default {
'z-button--' + type, 'z-button--' + type,
'z-button--' + size, 'z-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;
} }