diff --git a/build/utils/postcss_pipe.js b/build/utils/postcss_pipe.js index 0a6cd4ed4..f1bdbd8d1 100644 --- a/build/utils/postcss_pipe.js +++ b/build/utils/postcss_pipe.js @@ -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 ]; }; diff --git a/build/webpack.config.prod.js b/build/webpack.config.prod.js index 65cc03030..d4a45855b 100644 --- a/build/webpack.config.prod.js +++ b/build/webpack.config.prod.js @@ -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 }, diff --git a/docs/examples-dist/icon.vue b/docs/examples-dist/icon.vue index d79da066a..dc0e0a8e7 100644 --- a/docs/examples-dist/icon.vue +++ b/docs/examples-dist/icon.vue @@ -124,6 +124,14 @@ password-not-view + + + wap-nav + + + + wap-home + diff --git a/docs/examples-dist/picker.vue b/docs/examples-dist/picker.vue index e9be813e4..c530067af 100644 --- a/docs/examples-dist/picker.vue +++ b/docs/examples-dist/picker.vue @@ -4,7 +4,7 @@ - + @@ -21,6 +21,7 @@ const citys = { export default { data() { return { + title: '地区选择', pickerColumns: [ { values: Object.keys(citys), diff --git a/docs/examples-docs/icon.md b/docs/examples-docs/icon.md index 8c0a11a1a..1c54c7dc3 100644 --- a/docs/examples-docs/icon.md +++ b/docs/examples-docs/icon.md @@ -180,6 +180,14 @@ export default { password-not-view + + + wap-nav + + + + wap-home + ``` ::: diff --git a/package.json b/package.json index 68874a816..99bdadd2c 100644 --- a/package.json +++ b/package.json @@ -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", diff --git a/packages/vant-css/assets/icons.sketch b/packages/vant-css/assets/icons.sketch index f8b3455bf..95917ce6b 100644 Binary files a/packages/vant-css/assets/icons.sketch and b/packages/vant-css/assets/icons.sketch differ diff --git a/packages/vant-css/package.json b/packages/vant-css/package.json index 6facd66d6..91c2f2a41 100644 --- a/packages/vant-css/package.json +++ b/packages/vant-css/package.json @@ -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" diff --git a/packages/vant-css/scripts/fount-config.js b/packages/vant-css/scripts/fount-config.js index 7be9993d7..43b039770 100644 --- a/packages/vant-css/scripts/fount-config.js +++ b/packages/vant-css/scripts/fount-config.js @@ -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' } ] }; diff --git a/packages/vant-css/src/icon.css b/packages/vant-css/src/icon.css index ea7ec18b3..d785f143a 100644 --- a/packages/vant-css/src/icon.css +++ b/packages/vant-css/src/icon.css @@ -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'; } /* '' */ \ No newline at end of file +.van-icon-password-not-view:before { content: '\e81e'; } /* '' */ +.van-icon-wap-nav:before { content: '\e81f'; } /* '' */ +.van-icon-wap-home:before { content: '\e820'; } /* '' */ \ No newline at end of file diff --git a/packages/vant-css/src/reset.css b/packages/vant-css/src/reset.css index ea3cccdaa..8221edc3a 100644 --- a/packages/vant-css/src/reset.css +++ b/packages/vant-css/src/reset.css @@ -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; diff --git a/src/index.js b/src/index.js index 6e0a20b2d..7146342dd 100644 --- a/src/index.js +++ b/src/index.js @@ -81,7 +81,7 @@ if (typeof window !== 'undefined' && window.Vue) { module.exports = { install, - version: '0.5.7', + version: '0.5.11', Button, Switch, Field,