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/package.json b/package.json index 3007c2b99..0aadefc6c 100644 --- a/package.json +++ b/package.json @@ -105,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/package.json b/packages/vant-css/package.json index 019df754f..2657cb110 100644 --- a/packages/vant-css/package.json +++ b/packages/vant-css/package.json @@ -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/src/reset.css b/packages/vant-css/src/reset.css index 1d465fe10..8221edc3a 100644 --- a/packages/vant-css/src/reset.css +++ b/packages/vant-css/src/reset.css @@ -1,4 +1,46 @@ -@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; @@ -22,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;