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

[bugfix] Tag: text line height in android browser (#773)

Browse Source
This commit is contained in:
neverland 2018-03-26 10:51:34 +08:00 committed by GitHub
parent 45859cf0a6
commit 2dc5647d20
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 70 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
package.json
View File

@ -50,7 +50,7 @@
"vue": ">= 2.5.0"
},
"devDependencies": {
"autoprefixer": "^8.1.0",
"autoprefixer": "^8.2.0",
"avoriaz": "2.0.0",
"babel-cli": "^6.26.0",
"babel-core": "^6.26.0",
@ -64,12 +64,12 @@
"cross-env": "^5.1.4",
"css-loader": "^0.28.11",
"dependency-tree": "^6.0.1",
"eslint": "^4.19.0",
"eslint-plugin-vue": "^4.3.0",
"eslint": "^4.19.1",
"eslint-plugin-vue": "^4.4.0",
"extract-text-webpack-plugin": "^4.0.0-beta.0",
"fast-vue-md-loader": "^1.0.3",
"gh-pages": "^1.0.0",
"html-webpack-plugin": "3.0.6",
"html-webpack-plugin": "3.1.0",
"isparta-loader": "^2.0.0",
"karma": "^2.0.0",
"karma-chrome-launcher": "^2.2.0",
@ -78,12 +78,12 @@
"karma-phantomjs-launcher": "^1.0.4",
"karma-sinon-chai": "^1.3.2",
"karma-spec-reporter": "^0.0.32",
"karma-webpack": "^2.0.13",
"mocha": "^5.0.4",
"postcss": "^6.0.20",
"karma-webpack": "2.0.13",
"mocha": "^5.0.5",
"postcss": "^6.0.21",
"postcss-calc": "^6.0.0",
"postcss-easy-import": "^3.0.0",
"postcss-loader": "^2.1.2",
"postcss-loader": "^2.1.3",
"precss": "2.0.0",
"progress-bar-webpack-plugin": "^1.11.0",
"rimraf": "^2.5.4",
@ -95,14 +95,14 @@
"url-loader": "^1.0.1",
"vant-doc": "1.0.4",
"vue": "2.5.16",
"vue-loader": "^14.2.1",
"vue-loader": "^14.2.2",
"vue-router": "^3.0.1",
"vue-sfc-compiler": "^0.0.8",
"vue-style-loader": "^4.0.2",
"vue-style-loader": "^4.1.0",
"vue-template-compiler": "2.5.16",
"vue-template-es2015-compiler": "^1.6.0",
"webpack": "^4.1.1",
"webpack-cli": "^2.0.12",
"webpack": "^4.2.0",
"webpack-cli": "^2.0.13",
"webpack-dev-server": "3.1.1",
"webpack-merge": "^4.1.2"
}

4
packages/vant-css/src/tag.css
View File

@ -2,8 +2,8 @@
.van-tag {
display: inline-block;
padding: 0 5px;
line-height: 18px;
padding: 2px 5px;
line-height: normal;
border-radius: 3px;
font-size: 10px;
background: $gray;

108
yarn.lock
View File

@ -397,15 +397,15 @@ autoprefixer@^6.3.1:
postcss "^5.2.16"
postcss-value-parser "^3.2.3"
autoprefixer@^8.1.0:
version "8.1.0"
resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-8.1.0.tgz#374cf35be1c0e8fce97408d876f95f66f5cb4641"
autoprefixer@^8.2.0:
version "8.2.0"
resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-8.2.0.tgz#1e49b611b31a5259b86b7a6b2b1b8faf091abe2a"
dependencies:
browserslist "^3.1.1"
caniuse-lite "^1.0.30000810"
browserslist "^3.2.0"
caniuse-lite "^1.0.30000817"
normalize-range "^0.1.2"
num2fraction "^1.2.2"
postcss "^6.0.19"
postcss "^6.0.20"
postcss-value-parser "^3.2.3"
avoriaz@2.0.0:
@ -1451,12 +1451,12 @@ browserslist@^2.1.2:
caniuse-lite "^1.0.30000792"
electron-to-chromium "^1.3.30"
browserslist@^3.1.1:
version "3.1.1"
resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-3.1.1.tgz#d380fc048bc3a33e60fb87dc135110ebaaa6320a"
browserslist@^3.2.0:
version "3.2.3"
resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-3.2.3.tgz#ad36e56a43daeacf4d2b7bb16441b7ac30be4510"
dependencies:
caniuse-lite "^1.0.30000809"
electron-to-chromium "^1.3.33"
caniuse-lite "^1.0.30000819"
electron-to-chromium "^1.3.40"
buffer-indexof@^1.0.0:
version "1.1.1"
@ -1618,9 +1618,9 @@ caniuse-lite@^1.0.30000792:
version "1.0.30000792"
resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000792.tgz#d0cea981f8118f3961471afbb43c9a1e5bbf0332"
caniuse-lite@^1.0.30000809, caniuse-lite@^1.0.30000810:
version "1.0.30000811"
resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000811.tgz#0b6e40f2efccc27bd3cb52f91ee7ca4673d77d10"
caniuse-lite@^1.0.30000817, caniuse-lite@^1.0.30000819:
version "1.0.30000820"
resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000820.tgz#6e36ee75187a2c83d26d6504a1af47cc580324d2"
caseless@~0.11.0:
version "0.11.0"
@ -1658,7 +1658,7 @@ chalk@^1.0.0, chalk@^1.1.1, chalk@^1.1.3:
strip-ansi "^3.0.0"
supports-color "^2.0.0"
chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.3.0, chalk@^2.3.1:
chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.3.0:
version "2.3.1"
resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.3.1.tgz#523fe2678aec7b04e8041909292fe8b17059b796"
dependencies:
@ -2797,10 +2797,14 @@ ejs@^2.3.1:
version "2.5.7"
resolved "https://registry.yarnpkg.com/ejs/-/ejs-2.5.7.tgz#cc872c168880ae3c7189762fd5ffc00896c9518a"
electron-to-chromium@^1.2.7, electron-to-chromium@^1.3.30, electron-to-chromium@^1.3.33:
electron-to-chromium@^1.2.7, electron-to-chromium@^1.3.30:
version "1.3.33"
resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.33.tgz#bf00703d62a7c65238136578c352d6c5c042a545"
electron-to-chromium@^1.3.40:
version "1.3.40"
resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.40.tgz#1fbd6d97befd72b8a6f921dc38d22413d2f6fddf"
elegant-spinner@^1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/elegant-spinner/-/elegant-spinner-1.0.1.tgz#db043521c95d7e303fd8f345bedc3349cfb0729e"
@ -2983,9 +2987,9 @@ escodegen@^1.6.1, escodegen@^1.8.0:
optionalDependencies:
source-map "~0.5.6"
eslint-plugin-vue@^4.3.0:
version "4.3.0"
resolved "https://registry.yarnpkg.com/eslint-plugin-vue/-/eslint-plugin-vue-4.3.0.tgz#478c6267269dbaa20f6e8b2cfae7a0ccc98c1d72"
eslint-plugin-vue@^4.4.0:
version "4.4.0"
resolved "https://registry.yarnpkg.com/eslint-plugin-vue/-/eslint-plugin-vue-4.4.0.tgz#bfc3a71f76bd0e139313e4425a807257ae42f768"
dependencies:
vue-eslint-parser "^2.0.3"
@ -3000,9 +3004,9 @@ eslint-visitor-keys@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.0.0.tgz#3f3180fb2e291017716acb4c9d6d5b5c34a6a81d"
eslint@^4.19.0:
version "4.19.0"
resolved "https://registry.yarnpkg.com/eslint/-/eslint-4.19.0.tgz#9e900efb5506812ac374557034ef6f5c3642fc4c"
eslint@^4.19.1:
version "4.19.1"
resolved "https://registry.yarnpkg.com/eslint/-/eslint-4.19.1.tgz#32d1d653e1d90408854bfb296f076ec7e186a300"
dependencies:
ajv "^5.3.0"
babel-code-frame "^6.22.0"
@ -4148,9 +4152,9 @@ html-minifier@^3.2.3:
relateurl "0.2.x"
uglify-js "3.3.x"
html-webpack-plugin@3.0.6:
version "3.0.6"
resolved "https://registry.yarnpkg.com/html-webpack-plugin/-/html-webpack-plugin-3.0.6.tgz#d35b0452aae129a8a9f3fac44a169a625d8cf3fa"
html-webpack-plugin@3.1.0:
version "3.1.0"
resolved "https://registry.yarnpkg.com/html-webpack-plugin/-/html-webpack-plugin-3.1.0.tgz#6e02baaedb1e906310917f03239c793a75af2885"
dependencies:
html-minifier "^3.2.3"
loader-utils "^0.2.16"
@ -5028,7 +5032,7 @@ karma-spec-reporter@^0.0.32:
dependencies:
colors "^1.1.2"
karma-webpack@^2.0.13:
karma-webpack@2.0.13:
version "2.0.13"
resolved "https://registry.yarnpkg.com/karma-webpack/-/karma-webpack-2.0.13.tgz#cf56e3056c15b7747a0bb2140fc9a6be41dd9f02"
dependencies:
@ -5765,9 +5769,9 @@ mkdirp@0.5.1, mkdirp@0.5.x, "mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1, mkdi
dependencies:
minimist "0.0.8"
mocha@^5.0.4:
version "5.0.4"
resolved "https://registry.yarnpkg.com/mocha/-/mocha-5.0.4.tgz#6b7aa328472da1088e69d47e75925fd3a3bb63c6"
mocha@^5.0.5:
version "5.0.5"
resolved "https://registry.yarnpkg.com/mocha/-/mocha-5.0.5.tgz#e228e3386b9387a4710007a641f127b00be44b52"
dependencies:
browser-stdout "1.3.1"
commander "2.11.0"
@ -6812,9 +6816,9 @@ postcss-load-plugins@^2.3.0:
cosmiconfig "^2.1.1"
object-assign "^4.1.0"
postcss-loader@^2.1.2:
version "2.1.2"
resolved "https://registry.yarnpkg.com/postcss-loader/-/postcss-loader-2.1.2.tgz#03f54e23be736c9ea4f610e17d2a299254c05130"
postcss-loader@^2.1.3:
version "2.1.3"
resolved "https://registry.yarnpkg.com/postcss-loader/-/postcss-loader-2.1.3.tgz#eb210da734e475a244f76ccd61f9860f5bb3ee09"
dependencies:
loader-utils "^1.1.0"
postcss "^6.0.0"
@ -7070,14 +7074,6 @@ postcss@^6.0.0, postcss@^6.0.1, postcss@^6.0.11, postcss@^6.0.13, postcss@^6.0.1
source-map "^0.6.1"
supports-color "^5.1.0"
postcss@^6.0.19:
version "6.0.19"
resolved "https://registry.yarnpkg.com/postcss/-/postcss-6.0.19.tgz#76a78386f670b9d9494a655bf23ac012effd1555"
dependencies:
chalk "^2.3.1"
source-map "^0.6.1"
supports-color "^5.2.0"
postcss@^6.0.20:
version "6.0.20"
resolved "https://registry.yarnpkg.com/postcss/-/postcss-6.0.20.tgz#686107e743a12d5530cb68438c590d5b2bf72c3c"
@ -7086,6 +7082,14 @@ postcss@^6.0.20:
source-map "^0.6.1"
supports-color "^5.3.0"
postcss@^6.0.21:
version "6.0.21"
resolved "https://registry.yarnpkg.com/postcss/-/postcss-6.0.21.tgz#8265662694eddf9e9a5960db6da33c39e4cd069d"
dependencies:
chalk "^2.3.2"
source-map "^0.6.1"
supports-color "^5.3.0"
precinct@^4.0.0:
version "4.0.0"
resolved "https://registry.yarnpkg.com/precinct/-/precinct-4.0.0.tgz#ce67108123b8ae7c156180fb3836c5e5de24654f"
@ -9241,9 +9245,9 @@ vue-lazyload@^1.2.2:
version "1.2.2"
resolved "https://registry.yarnpkg.com/vue-lazyload/-/vue-lazyload-1.2.2.tgz#73335ed32db25264f5957df1a21d277823423743"
vue-loader@^14.2.1:
version "14.2.1"
resolved "https://registry.yarnpkg.com/vue-loader/-/vue-loader-14.2.1.tgz#3ace19f98187b1fa9e0709defa963a0a2396b6b3"
vue-loader@^14.2.2:
version "14.2.2"
resolved "https://registry.yarnpkg.com/vue-loader/-/vue-loader-14.2.2.tgz#c8cf3c2e29b6fb2ee595248a2aa6005038a125b3"
dependencies:
consolidate "^0.14.0"
hash-sum "^1.0.2"
@ -9276,9 +9280,9 @@ vue-style-loader@^4.0.1:
hash-sum "^1.0.2"
loader-utils "^1.0.2"
vue-style-loader@^4.0.2:
version "4.0.2"
resolved "https://registry.yarnpkg.com/vue-style-loader/-/vue-style-loader-4.0.2.tgz#e89aa4702a0c6b9630d8de70b1cbddb06b9ad254"
vue-style-loader@^4.1.0:
version "4.1.0"
resolved "https://registry.yarnpkg.com/vue-style-loader/-/vue-style-loader-4.1.0.tgz#7588bd778e2c9f8d87bfc3c5a4a039638da7a863"
dependencies:
hash-sum "^1.0.2"
loader-utils "^1.0.2"
@ -9318,9 +9322,9 @@ webpack-addons@^1.1.5:
dependencies:
jscodeshift "^0.4.0"
webpack-cli@^2.0.12:
version "2.0.12"
resolved "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-2.0.12.tgz#64db876d044f03d8d6544281854b71a3a3c77dd3"
webpack-cli@^2.0.13:
version "2.0.13"
resolved "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-2.0.13.tgz#6e2bd9ef91345344737217e22e29001ad8537518"
dependencies:
chalk "^2.3.2"
cross-spawn "^6.0.5"
@ -9425,9 +9429,9 @@ webpack-sources@^1.0.1, webpack-sources@^1.1.0:
source-list-map "^2.0.0"
source-map "~0.6.1"
webpack@^4.1.1:
version "4.1.1"
resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.1.1.tgz#44e4d6a869dd36fdfc0b227f9bd865a4bccfd81c"
webpack@^4.2.0:
version "4.2.0"
resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.2.0.tgz#a4f80807651a0e611bb09609600dc266262efcc1"
dependencies:
acorn "^5.0.0"
acorn-dynamic-import "^3.0.0"