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

Merge remote-tracking branch 'upstream/dev' into dev

Browse Source
This commit is contained in:
niunai 2017-05-25 17:56:46 +08:00
commit 4205840894
12 changed files with 92 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build/utils/postcss_pipe.js
View File

@ -4,7 +4,6 @@ var config = {
'separators': {'descendent': '__', 'modifier': '--'}
}
};
var reset = require('postcss-css-reset')();
// https://github.com/trysound/postcss-easy-import
var partialImport = require('postcss-easy-import')();
@ -25,7 +24,6 @@ module.exports = function (webpack) {
partialImport,
bem,
precss,
autoprefixer,
reset
autoprefixer
];
};

2
build/webpack.config.prod.js
View File

@ -6,7 +6,7 @@ var devConfig = require('./webpack.config.dev.js');
module.exports = merge(devConfig, {
output: {
path: path.join(__dirname, '../docs/dist'),
publicPath: '/zanui/vue',
publicPath: 'https://b.yzcdn.cn/zanui/vue',
filename: '[name].[hash:8].js',
umdNamedDefine: true
},

8
docs/examples-dist/icon.vue
View File

@ -124,6 +124,14 @@
<van-icon name="password-not-view"></van-icon>
<span>password-not-view</span>
</van-col>
<van-col span="8">
<van-icon name="wap-nav"></van-icon>
<span>wap-nav</span>
</van-col>
<van-col span="8">
<van-icon name="wap-home"></van-icon>
<span>wap-home</span>
</van-col>
</van-row>
</example-block></section></template>

3
docs/examples-dist/picker.vue
View File

@ -4,7 +4,7 @@
</example-block><example-block title="带toolbar的Picker">
<van-picker :columns="pickerColumns" show-toolbar="" @change="handlePickerChange" @cancel="handlePickerCancel" @confirm="handlePickerConfirm"></van-picker>
<van-picker :title="title" :columns="pickerColumns" show-toolbar="" @change="handlePickerChange" @cancel="handlePickerCancel" @confirm="handlePickerConfirm"></van-picker>
@ -21,6 +21,7 @@ const citys = {
export default {
data() {
return {
title: '地区选择',
pickerColumns: [
{
values: Object.keys(citys),

8
docs/examples-docs/icon.md
View File

@ -180,6 +180,14 @@ export default {
<van-icon name="password-not-view"></van-icon>
<span>password-not-view</span>
</van-col>
<van-col span="8">
<van-icon name="wap-nav"></van-icon>
<span>wap-nav</span>
</van-col>
<van-col span="8">
<van-icon name="wap-home"></van-icon>
<span>wap-home</span>
</van-col>
</van-row>
```
:::

6
package.json
View File

@ -1,6 +1,6 @@
{
"name": "vant",
"version": "0.5.7",
"version": "0.5.11",
"description": "有赞vue wap组件库",
"main": "lib/vant.js",
"style": "lib/vant-css/index.css",
@ -19,7 +19,8 @@
"build:components": "webpack --progress --hide-modules --config build/webpack.components.js",
"build:vant": "webpack --progress --hide-modules --config build/webpack.build.js && webpack --progress --hide-modules --config build/webpack.build.min.js",
"build:example": "node build/genExamples.js",
"deploy": "npm run deploy:docs && gh-pages -d docs/dist --remote youzan && rimraf docs/dist",
"deploy": "npm run deploy:docs && npm run deploy:cdn && gh-pages -d docs/dist --remote youzan && rimraf docs/dist",
"deploy:cdn": "superman cdn /zanui/vue docs/dist/*.js docs/dist/*.css",
"deploy:docs": "rimraf docs/dist && npm run build:example && cross-env NODE_ENV=production webpack --progress --hide-modules --config build/webpack.config.prod.js",
"dist": "npm run clean && npm run build:file && npm run lint && npm run build:vant && npm run build:components && npm run build:utils && npm run build:vant-css",
"clean": "rimraf lib && rimraf packages/*/lib",
@ -104,7 +105,6 @@
"mocha": "^3.2.0",
"optimize-css-assets-webpack-plugin": "^1.3.0",
"postcss": "^5.1.2",
"postcss-css-reset": "^1.0.2",
"postcss-easy-import": "^2.0.0",
"postcss-loader": "^1.3.3",
"precss": "^1.4.0",

BIN
packages/vant-css/assets/icons.sketch
View File

Binary file not shown.

3
packages/vant-css/package.json
View File

@ -1,6 +1,6 @@
{
"name": "vant-css",
"version": "0.5.7",
"version": "0.5.11",
"description": "vant css.",
"main": "lib/index.css",
"style": "lib/index.css",
@ -18,7 +18,6 @@
"gulp": "^3.9.1",
"gulp-cssmin": "^0.1.7",
"gulp-postcss": "^6.1.1",
"postcss-css-reset": "^1.0.2",
"postcss-easy-import": "^2.0.0",
"precss": "^1.4.0",
"saladcss-bem": "^0.0.1"

14
packages/vant-css/scripts/fount-config.js
View File

@ -164,13 +164,23 @@ module.exports = {
},
{
keywords: ['password', 'view'],
src: '密码可查看.svg',
src: '密码可见.svg',
css: 'password-view'
},
{
keywords: ['password', 'not', 'view'],
src: '密码不可查看.svg',
src: '密码不见.svg',
css: 'password-not-view'
},
{
keywords: ['wap', 'nav'],
src: 'wap导航.svg',
css: 'wap-nav'
},
{
keywords: ['wap', 'home'],
src: 'wap首页.svg',
css: 'wap-home'
}
]
};

14
packages/vant-css/src/icon.css
View File

@ -2,11 +2,11 @@
@font-face {
font-family: 'vant-icon';
src: url('https://b.yzcdn.cn/zanui/icon/vant-icon-1f66ec158e.eot');
src: url('https://b.yzcdn.cn/zanui/icon/vant-icon-1f66ec158e.eot?#iefix') format('embedded-opentype'),
url('https://b.yzcdn.cn/zanui/icon/vant-icon-1f66ec158e.woff2') format('woff2'),
url('https://b.yzcdn.cn/zanui/icon/vant-icon-1f66ec158e.woff') format('woff'),
url('https://b.yzcdn.cn/zanui/icon/vant-icon-1f66ec158e.ttf') format('truetype')
src: url('https://b.yzcdn.cn/zanui/icon/vant-icon-3f0c3903d3.eot');
src: url('https://b.yzcdn.cn/zanui/icon/vant-icon-3f0c3903d3.eot?#iefix') format('embedded-opentype'),
url('https://b.yzcdn.cn/zanui/icon/vant-icon-3f0c3903d3.woff2') format('woff2'),
url('https://b.yzcdn.cn/zanui/icon/vant-icon-3f0c3903d3.woff') format('woff'),
url('https://b.yzcdn.cn/zanui/icon/vant-icon-3f0c3903d3.ttf') format('truetype')
}
.van-icon {
@ -77,4 +77,6 @@
.van-icon-wechat:before { content: '\e81b'; } /* '' */
.van-icon-alipay:before { content: '\e81c'; } /* '' */
.van-icon-password-view:before { content: '\e81d'; } /* '' */
.van-icon-password-not-view:before { content: '\e81e'; } /* '' */
.van-icon-password-not-view:before { content: '\e81e'; } /* '' */
.van-icon-wap-nav:before { content: '\e81f'; } /* '' */
.van-icon-wap-home:before { content: '\e820'; } /* '' */

49
packages/vant-css/src/reset.css
View File

@ -1,4 +1,50 @@
@reset-global mobile;
html, body, div, span, applet, object, iframe, h1, h2, h3, h4, h5, h6, p, blockquote, pre, a, abbr, acronym, address, big, cite, code, del, dfn, em, img, ins, kbd, q, s, samp, small, strike, strong, sub, sup, tt, var, b, u, i, center, dl, dt, dd, ol, ul, li, fieldset, form, label, legend, table, caption, tbody, tfoot, thead, tr, th, td, article, aside, canvas, details, embed, figure, figcaption, footer, header, hgroup, menu, nav, output, ruby, section, summary, time, mark, audio, video {
margin: 0;
padding: 0;
border: 0;
font: inherit;
font-size: 100%;
vertical-align: baseline
}
html {
line-height: 1
}
ol, ul {
list-style: none
}
table {
border-collapse: collapse;
border-spacing: 0
}
caption, th, td {
font-weight: normal;
vertical-align: middle
}
q, blockquote {
quotes: none
}
q:before, q:after, blockquote:before, blockquote:after {
content: "";
content: none
}
a img {
border: none
}
article, aside, details, figcaption, figure, footer, header, hgroup, menu, nav, section, summary {
display: block
}
* {
box-sizing: content-box;
}
body {
font-family: Helvetica, "STHeiti STXihei", "Microsoft YaHei", Tohoma, Arial, sans-serif;
@ -18,7 +64,6 @@ input[type='number'],input[type='text'],input[type='password'],input[type='email
select,
textarea {
font-family: inherit;
font-size: 100%;
margin: 0;
-webkit-tap-highlight-color: rgba(0, 0, 0, 0);
-webkit-appearance: none;

2
src/index.js
View File

@ -81,7 +81,7 @@ if (typeof window !== 'undefined' && window.Vue) {
module.exports = {
install,
version: '0.5.7',
version: '0.5.11',
Button,
Switch,
Field,