From 47576ec47c69ef09058d0b0800963c0eccc7afb7 Mon Sep 17 00:00:00 2001 From: neverland Date: Thu, 12 Oct 2017 06:25:55 -0500 Subject: [PATCH] [breaking change] remove reset.css dependencies (#196) * [breaking change] remove reset.css dependencies * [bugfix] Doc footerNav not show * [bugfix] PasswordInput Doc link --- docs/examples-docs/zh-CN/lazyload.md | 7 +- docs/examples-docs/zh-CN/password-input.md | 2 +- docs/src/ExamplesApp.vue | 1 + docs/src/components/demo-list.vue | 4 +- docs/src/components/mobile-nav.vue | 1 + package.json | 5 +- packages/vant-css/src/address-edit.css | 3 +- packages/vant-css/src/checkbox.css | 15 +- packages/vant-css/src/common/normalize.css | 6 +- packages/vant-css/src/contact-card.css | 2 +- packages/vant-css/src/contact-list.css | 3 +- packages/vant-css/src/coupon-list.css | 2 +- packages/vant-css/src/index.css | 1 - packages/vant-css/src/nav-bar.css | 2 +- packages/vant-css/src/sku.css | 370 +++++++++++---------- packages/vant-css/src/submit-bar.css | 2 +- packages/vant-css/src/switch.css | 5 +- packages/vant-css/src/toast.css | 7 +- yarn.lock | 198 +++++------ 19 files changed, 331 insertions(+), 305 deletions(-) diff --git a/docs/examples-docs/zh-CN/lazyload.md b/docs/examples-docs/zh-CN/lazyload.md index 051a01e3b..5f23a0792 100644 --- a/docs/examples-docs/zh-CN/lazyload.md +++ b/docs/examples-docs/zh-CN/lazyload.md @@ -1,16 +1,19 @@ diff --git a/docs/examples-docs/zh-CN/password-input.md b/docs/examples-docs/zh-CN/password-input.md index 440e96475..b520798e3 100644 --- a/docs/examples-docs/zh-CN/password-input.md +++ b/docs/examples-docs/zh-CN/password-input.md @@ -19,7 +19,7 @@ export default { ## PasswordInput 密码输入框 -密码输入框组件通常与 [数字键盘](/zanui/vue/component/number-keyboard) 组件配合使用 +密码输入框组件通常与 [数字键盘](#/zh-CN/component/number-keyboard) 组件配合使用 ### 使用指南 ``` javascript diff --git a/docs/src/ExamplesApp.vue b/docs/src/ExamplesApp.vue index 347729286..9085f5c26 100644 --- a/docs/src/ExamplesApp.vue +++ b/docs/src/ExamplesApp.vue @@ -9,5 +9,6 @@ body { background-color: #f8f8f8; font-family: Arial, Helvetica, "STHeiti STXihei", "Microsoft YaHei", Tohoma, sans-serif; -webkit-font-smoothing: antialiased; + padding-bottom: 20px; } diff --git a/docs/src/components/demo-list.vue b/docs/src/components/demo-list.vue index 088ae52ea..80614eaca 100644 --- a/docs/src/components/demo-list.vue +++ b/docs/src/components/demo-list.vue @@ -68,13 +68,13 @@ export default { overflow: hidden; background: url(https://img.yzcdn.cn/upload_files/2017/04/20/FjwR1mraVIqtHWb8YWDW_YzQ_Kh2.png) center center no-repeat; background-size: 156px 40px; - margin-bottom: 10px; + margin: 0 0 10px; } .zanui-desc { font-size: 14px; color: #666; - margin-bottom: 50px; + margin: 0 0 50px; } } diff --git a/docs/src/components/mobile-nav.vue b/docs/src/components/mobile-nav.vue index 0df077fa1..38f67da4e 100644 --- a/docs/src/components/mobile-nav.vue +++ b/docs/src/components/mobile-nav.vue @@ -96,6 +96,7 @@ export default { } > p { + margin: 0; border-top: 1px solid #e5e5e5; } } diff --git a/package.json b/package.json index d864fada3..8725e9994 100644 --- a/package.json +++ b/package.json @@ -47,7 +47,7 @@ "vue-lazyload": "^1.1.3" }, "peerDependencies": { - "vue": "2.4.2" + "vue": "^2.4.4" }, "devDependencies": { "autoprefixer": "^7.1.3", @@ -71,7 +71,6 @@ "eslint-plugin-vue": "^2.1.0", "extract-text-webpack-plugin": "2.0.0", "felint": "^0.5.0-alpha.3", - "file-loader": "^0.11.2", "file-save": "^0.2.0", "friendly-errors-webpack-plugin": "^1.6.1", "gh-pages": "^1.0.0", @@ -119,6 +118,6 @@ "webpack-bundle-analyzer": "^2.9.0", "webpack-dev-server": "^2.7.1", "webpack-merge": "^4.1.0", - "zan-doc": "0.3.2" + "zan-doc": "^0.3.5" } } diff --git a/packages/vant-css/src/address-edit.css b/packages/vant-css/src/address-edit.css index d834a9834..32d53bd30 100644 --- a/packages/vant-css/src/address-edit.css +++ b/packages/vant-css/src/address-edit.css @@ -54,10 +54,11 @@ &__title { font-size: 14px; - margin-bottom: 4px; + margin: 0 0 4px; } &__subtitle { + margin: 0; font-size: 12px; color: $gray-darker; } diff --git a/packages/vant-css/src/checkbox.css b/packages/vant-css/src/checkbox.css index 3272dcfd2..1d722b80f 100644 --- a/packages/vant-css/src/checkbox.css +++ b/packages/vant-css/src/checkbox.css @@ -1,12 +1,12 @@ @import './common/var.css'; -$van-checkbox-size: 18px; +$van-checkbox-size: 20px; .van-checkbox { overflow: hidden; .van-icon-success { - color: #fff; + color: $white; display: block; line-height: 1; font-size: 14px; @@ -15,10 +15,11 @@ $van-checkbox-size: 18px; border: 1px solid #aaa; width: $van-checkbox-size; height: $van-checkbox-size; + box-sizing: border-box; &::before { margin: 0 auto; - line-height: $van-checkbox-size; + line-height: calc($van-checkbox-size - 2px); transition: all .2s cubic-bezier(.12,.4,.29,1.46) .1s; transform: scale(0); } @@ -26,7 +27,7 @@ $van-checkbox-size: 18px; &__input { position: relative; - height: calc($van-checkbox-size + 2px); + height: $van-checkbox-size; margin-right: 15px; float: left; } @@ -37,14 +38,14 @@ $van-checkbox-size: 18px; left: 0; opacity: 0; margin: 0; - width: calc($van-checkbox-size + 2px); - height: calc($van-checkbox-size + 2px); + width: $van-checkbox-size; + height: $van-checkbox-size; } &__label { display: block; margin-left: 37px; - line-height: calc($van-checkbox-size + 2px); + line-height: $van-checkbox-size; } &--round { diff --git a/packages/vant-css/src/common/normalize.css b/packages/vant-css/src/common/normalize.css index b25a01fa2..8fe958d1b 100644 --- a/packages/vant-css/src/common/normalize.css +++ b/packages/vant-css/src/common/normalize.css @@ -30,6 +30,8 @@ ul { list-style: none; } -button { - font-family: inherit; +input, +button, +textarea { + font: inherit; } diff --git a/packages/vant-css/src/contact-card.css b/packages/vant-css/src/contact-card.css index 9daea32a5..e9744c697 100644 --- a/packages/vant-css/src/contact-card.css +++ b/packages/vant-css/src/contact-card.css @@ -2,7 +2,7 @@ .van-contact-card { position: relative; - background-color: #fff; + background-color: $white; &--add { line-height: 40px; diff --git a/packages/vant-css/src/contact-list.css b/packages/vant-css/src/contact-list.css index 8f50fccbe..929a5192d 100644 --- a/packages/vant-css/src/contact-list.css +++ b/packages/vant-css/src/contact-list.css @@ -25,8 +25,9 @@ } &__text { + margin: 0; + color: $text-color; font-size: 14px; - color: #333; line-height: 1.5; } diff --git a/packages/vant-css/src/coupon-list.css b/packages/vant-css/src/coupon-list.css index 8c65692f6..a4efc124a 100644 --- a/packages/vant-css/src/coupon-list.css +++ b/packages/vant-css/src/coupon-list.css @@ -146,7 +146,7 @@ span { color: $gray-dark; font-size: 12px; - margin-top: 5px; + margin: 5px 0 0; } p, diff --git a/packages/vant-css/src/index.css b/packages/vant-css/src/index.css index 86db9d790..266d2779d 100644 --- a/packages/vant-css/src/index.css +++ b/packages/vant-css/src/index.css @@ -4,7 +4,6 @@ /* base */ @import './base.css'; -@import './reset.css'; /* common components */ @import './col.css'; diff --git a/packages/vant-css/src/nav-bar.css b/packages/vant-css/src/nav-bar.css index 504a9ca2b..b12d5e8c7 100644 --- a/packages/vant-css/src/nav-bar.css +++ b/packages/vant-css/src/nav-bar.css @@ -6,7 +6,7 @@ user-select: none; text-align: center; line-height: 46px; - background-color: #fff; + background-color: $white; .van-icon { color: $blue; diff --git a/packages/vant-css/src/sku.css b/packages/vant-css/src/sku.css index 02adca133..b83781c47 100644 --- a/packages/vant-css/src/sku.css +++ b/packages/vant-css/src/sku.css @@ -1,202 +1,218 @@ -@import './mixins/border_retina.css'; +@import './common/var.css'; -.van-sku-container { - background: #f8f8f8; -} -.van-sku-layout { - background: #fff; -} -.van-sku-body { - max-height: 350px; - overflow-y: scroll; - - &::-webkit-scrollbar { - display: none; +.van-sku { + &-container { + background: $background-color; } -} -.van-sku-group-container { - position: relative; - padding-top: 12px; - padding-bottom: 2px; - margin-left: 15px; - &::after { - @mixin border-retina (bottom); + &-layout { + background: $white; } -} -.van-sku-row-group { - margin-right: 15px; - margin-bottom: 10px; + &-body { + max-height: 350px; + overflow-y: scroll; - &:last-child { - margin-bottom: 0; + &::-webkit-scrollbar { + display: none; + } } -} -/* - sku header - */ -.van-sku-header { - position: relative; - margin-left: 15px; + &-group-container { + margin-left: 15px; + position: relative; + padding: 12px 0 2px; - &::after { - @mixin border-retina (bottom); + &::after { + @mixin border-retina (bottom); + } } -} -.van-sku-header__img-wrap { - position: relative; - float: left; - margin-top: -10px; - width: 80px; - height: 80px; - background: #fafafa; - border-radius: 2px; - .van-sku__goods-img { + &-row-group { + margin: 0 15px 10px 0; + + &:last-child { + margin-bottom: 0; + } + } + + /* sku header */ + &-header { + position: relative; + margin-left: 15px; + + &::after { + @mixin border-retina (bottom); + } + + &__img-wrap { + position: relative; + float: left; + margin-top: -10px; + width: 80px; + height: 80px; + background: $background-color; + border-radius: 2px; + + .van-sku__goods-img { + position: absolute; + margin: auto; + top: 0; + left: 0; + right: 0; + bottom: 0; + max-width: 100%; + max-height: 100%; + } + } + + &__goods-info { + padding: 10px 60px 10px 10px; + min-height: 82px; + overflow: hidden; + box-sizing: border-box; + } + } + + &__goods-name { + font-size: 12px; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + } + + &__price-symbol { + font-size: 14px; + vertical-align: middle; + } + + &__price-num { + vertical-align: middle; + } + + &__goods-price { + color: $red; + margin-top: 10px; + font-size: 16px; + vertical-align: middle; + } + + &__close-icon { position: absolute; - margin: auto; top: 0; - left: 0; right: 0; - bottom: 0; - max-width: 100%; - max-height: 100%; + width: 44px; + height: 44px; + background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACwAAAAsCAMAAAApWqozAAAAUVBMVEUAAACfn5+bm5uampqZmZmoqKiampqampqZmZmampqampqbm5ubm5uZmZmqqqqampqampqZmZmampqampqampqbm5ubm5uampqdnZ2ampqZmZkjZXmqAAAAGnRSTlMAFYBC5wm+rdPv1Ckl8wzZxKWicm9eUjoN8nSyS9UAAAFVSURBVDjLvZXbrsIgEEWhtAUU6M1a3f//oSeHWKfuVhv7IC+TkJVhz4UZ9bsThq5uYmzqbgifSV04LI4r9Fs0FRHw/WhCugUz9h6IRdpmryVgzfLGWKC8brEF0E58ObVAsUIrC1y2fFwAW9GdhTfb6oyHZQ3+/C7us39VcgXE79o3sIgylayXdZdpIaJVH08rQnTE9BmeEPXsWMK1rV6m01Xz/dO1g5H3nH6yNcoZNnCPPoOXTjplemYlnR4h2wG9YppZ1WPItsOomGZWjeiyrWEU08wqgzrbBkERfWJWBTTZRiTFNLMqIWZ7x43atQYa+lA33EmG5KyB0yyDApT8/uvWFCCnTvIrtKRuLgqzQktRpNzMCi3l5kaymZXqiGS3blGX2Zl2ftGi6+avqtcsUvN/8a2++LCHRsH+kDkwvg4Mxt2Re3yY85pIsiaOLKD91faz8wcoUxux/aS9awAAAABJRU5ErkJggg==); + background-size: 22px 22px; + background-repeat: no-repeat; + background-position: 7px 10px; } -} -.van-sku-header__goods-info { - padding: 10px 60px 10px 10px; - min-height: 62px; - overflow: hidden; -} -.van-sku__goods-name { - font-size: 12px; - overflow: hidden; - text-overflow: ellipsis; - white-space: nowrap; -} -.van-sku__price-symbol { - font-size: 14px; - vertical-align: middle; -} -.van-sku__price-num { - vertical-align: middle; -} -.van-sku__goods-price { - margin-top: 10px; - font-size: 16px; - color: #f44; - vertical-align: middle; -} -.van-sku__close-icon { - position: absolute; - top: 0; - right: 0; - width: 44px; - height: 44px; - background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACwAAAAsCAMAAAApWqozAAAAUVBMVEUAAACfn5+bm5uampqZmZmoqKiampqampqZmZmampqampqbm5ubm5uZmZmqqqqampqampqZmZmampqampqampqbm5ubm5uampqdnZ2ampqZmZkjZXmqAAAAGnRSTlMAFYBC5wm+rdPv1Ckl8wzZxKWicm9eUjoN8nSyS9UAAAFVSURBVDjLvZXbrsIgEEWhtAUU6M1a3f//oSeHWKfuVhv7IC+TkJVhz4UZ9bsThq5uYmzqbgifSV04LI4r9Fs0FRHw/WhCugUz9h6IRdpmryVgzfLGWKC8brEF0E58ObVAsUIrC1y2fFwAW9GdhTfb6oyHZQ3+/C7us39VcgXE79o3sIgylayXdZdpIaJVH08rQnTE9BmeEPXsWMK1rV6m01Xz/dO1g5H3nH6yNcoZNnCPPoOXTjplemYlnR4h2wG9YppZ1WPItsOomGZWjeiyrWEU08wqgzrbBkERfWJWBTTZRiTFNLMqIWZ7x43atQYa+lA33EmG5KyB0yyDApT8/uvWFCCnTvIrtKRuLgqzQktRpNzMCi3l5kaymZXqiGS3blGX2Zl2ftGi6+avqtcsUvN/8a2++LCHRsH+kDkwvg4Mxt2Re3yY85pIsiaOLKD91faz8wcoUxux/aS9awAAAABJRU5ErkJggg==); - background-size: 22px 22px; - background-repeat: no-repeat; - background-position: 7px 10px; -} -/* - sku row -*/ -.van-sku-row__title { - font-size: 14px; - padding-bottom: 10px; -} -.van-sku-row__item { - display: inline-block; - padding: 5px 9px; - margin-right: 10px; - margin-bottom: 10px; - height: 16px; - min-width: 32px; - line-height: 16px; - font-size: 12px; - color: #333; - text-align: center; - border: 1px solid #999; - border-radius: 3px; + /* sku row */ + &-row { + &__title { + font-size: 14px; + padding-bottom: 10px; + } - &.van-sku-row__item--active { - border-color: #f44; - color: #fff; - background: #f44; + &__item { + display: inline-block; + padding: 5px 9px; + margin: 0 10px 10px 0; + height: 28px; + min-width: 52px; + line-height: 16px; + font-size: 12px; + color: $text-color; + text-align: center; + border: 1px solid $gray-dark; + border-radius: 3px; + box-sizing: border-box; + + &.van-sku-row__item--active { + color: $white; + border-color: $red; + background: $red; + } + + &.van-sku-row__item--disabled { + background: $active-color; + border-color: $gray-light; + color: $gray; + } + } } - &.van-sku-row__item--disabled { - background: #efefef; - border-color: #e5e5e5; - color: #cacaca; + + /* sku stepper */ + &-stepper { + &-stock { + padding: 12px 0; + margin-left: 15px; + } + + &-container { + height: 30px; + margin-right: 20px; + } } -} + + &__stepper { + top: 7px; + left: 4px; + float: right; -/* - sku stepper -*/ -.van-sku-stepper-stock { - padding: 12px 0; - margin-left: 15px; -} -.van-sku-stepper-container { - height: 30px; - margin-right: 20px; -} -.van-sku__stepper-title { - float: left; - line-height: 30px; - font-size: 14px; -} -.van-sku__stepper { - float: right; - top: 7px; - left: 4px; -} -.van-sku__stock { - display: inline-block; - margin-right: 10px; - color: #999; - font-size: 12px; -} -.van-sku__quota { - display: inline-block; - color: #f44; - font-size: 12px; -} + &-title { + float: left; + line-height: 30px; + font-size: 14px; + } + } -/* - sku actions -*/ -.van-sku-actions { - margin-top: 10px; - font-size: 0; -} -.van-sku__add-cart-btn { - width: 50%; - height: 50px; - padding: 0; - border: 0; - background: #f85; - color: #fff; - font-size: 16px; - line-height: 50px; - text-align: center; + &__stock { + display: inline-block; + margin-right: 10px; + color: $gray-dark; + font-size: 12px; + } + + &__quota { + display: inline-block; + color: $red; + font-size: 12px; + } - & + .van-sku__buy-btn { + /* sku actions */ + &-actions { + margin-top: 10px; + font-size: 0; + } + + &__add-cart-btn { width: 50%; + height: 50px; + padding: 0; + border: 0; + background: $orange; + color: $white; + font-size: 16px; + line-height: 50px; + text-align: center; + + & + .van-sku__buy-btn { + width: 50%; + } + } + + &__buy-btn { + width: 100%; + height: 50px; + padding: 0; + border: 0; + background: $red; + color: $white; + font-size: 16px; + line-height: 50px; + text-align: center; } } -.van-sku__buy-btn { - width: 100%; - height: 50px; - padding: 0; - border: 0; - background: #f44; - color: #fff; - font-size: 16px; - line-height: 50px; - text-align: center; -} diff --git a/packages/vant-css/src/submit-bar.css b/packages/vant-css/src/submit-bar.css index db50bd56b..8d648d3b7 100644 --- a/packages/vant-css/src/submit-bar.css +++ b/packages/vant-css/src/submit-bar.css @@ -13,7 +13,7 @@ font-size: 12px; line-height: 18px; padding: 10px 10px; - background-color: #fff6e1; + background-color: $white6e1; } &__bar { diff --git a/packages/vant-css/src/switch.css b/packages/vant-css/src/switch.css index 73c9c9c3f..746b81e52 100644 --- a/packages/vant-css/src/switch.css +++ b/packages/vant-css/src/switch.css @@ -1,12 +1,13 @@ @import './common/var.css'; .van-switch { - height: 31px; - width: 51px; + height: 33px; + width: 53px; display: inline-block; position: relative; background: $white; border-radius: 16px; + box-sizing: border-box; border: 1px solid rgba(0, 0, 0, .1); border-radius: 32px; diff --git a/packages/vant-css/src/toast.css b/packages/vant-css/src/toast.css index 10501a1b0..652fe20cb 100644 --- a/packages/vant-css/src/toast.css +++ b/packages/vant-css/src/toast.css @@ -13,6 +13,7 @@ align-items: center; justify-content: center; flex-direction: column; + box-sizing: border-box; transform: translate3d(-50%, -50%, 0); background-color: rgba(39, 39, 39, .7); @@ -32,12 +33,12 @@ &--text { padding: 12px; - min-width: 200px; + min-width: 220px; } &--default { - width: 90px; - min-height: 90px; + width: 120px; + min-height: 120px; padding: 15px; .van-toast__icon { diff --git a/yarn.lock b/yarn.lock index 7ebfdec6c..5dcf0a836 100644 --- a/yarn.lock +++ b/yarn.lock @@ -334,14 +334,14 @@ autoprefixer@^6.3.1: postcss-value-parser "^3.2.3" autoprefixer@^7.1.3: - version "7.1.4" - resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-7.1.4.tgz#960847dbaa4016bc8e8e52ec891cbf8f1257a748" + version "7.1.5" + resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-7.1.5.tgz#d65d14b83c7cd1dd7bc801daa00557addf5a06b2" dependencies: - browserslist "^2.4.0" - caniuse-lite "^1.0.30000726" + browserslist "^2.5.0" + caniuse-lite "^1.0.30000744" normalize-range "^0.1.2" num2fraction "^1.2.2" - postcss "^6.0.11" + postcss "^6.0.13" postcss-value-parser "^3.2.3" avoriaz@2.0.0: @@ -976,8 +976,8 @@ block-stream@*: inherits "~2.0.0" bluebird@^3.1.1, bluebird@^3.3.0, bluebird@^3.4.7: - version "3.5.0" - resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.0.tgz#791420d7f551eea2897453a8a77653f96606d67c" + version "3.5.1" + resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.1.tgz#d9551f9de98f1fcda1e683d17ee91a0602ee2eb9" bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.1.1, bn.js@^4.4.0: version "4.11.8" @@ -1119,12 +1119,12 @@ browserslist@^1.3.6, browserslist@^1.5.2, browserslist@^1.7.6: caniuse-db "^1.0.30000639" electron-to-chromium "^1.2.7" -browserslist@^2.1.2, browserslist@^2.4.0: - version "2.4.0" - resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-2.4.0.tgz#693ee93d01e66468a6348da5498e011f578f87f8" +browserslist@^2.1.2, browserslist@^2.5.0: + version "2.5.1" + resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-2.5.1.tgz#68e4bc536bbcc6086d62843a2ffccea8396821c6" dependencies: - caniuse-lite "^1.0.30000718" - electron-to-chromium "^1.3.18" + caniuse-lite "^1.0.30000744" + electron-to-chromium "^1.3.24" buffer-indexof@^1.0.0: version "1.1.1" @@ -1212,12 +1212,12 @@ caniuse-api@^1.5.2: lodash.uniq "^4.5.0" caniuse-db@^1.0.30000529, caniuse-db@^1.0.30000634, caniuse-db@^1.0.30000639: - version "1.0.30000740" - resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30000740.tgz#03fcaaa176e3ed075895f72d46c1a12149bbeac9" + version "1.0.30000746" + resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30000746.tgz#501098c66f5fbbf634c02f25508b05e8809910f4" -caniuse-lite@^1.0.30000718, caniuse-lite@^1.0.30000726: - version "1.0.30000740" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000740.tgz#f2c4c04d6564eb812e61006841700ad557f6f973" +caniuse-lite@^1.0.30000744: + version "1.0.30000746" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000746.tgz#c64f95a3925cfd30207a308ed76c1ae96ea09ea0" caseless@~0.12.0: version "0.12.0" @@ -1684,12 +1684,12 @@ crypto-browserify@^3.11.0: randombytes "^2.0.0" css-color-function@^1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/css-color-function/-/css-color-function-1.3.0.tgz#72c767baf978f01b8a8a94f42f17ba5d22a776fc" + version "1.3.3" + resolved "https://registry.yarnpkg.com/css-color-function/-/css-color-function-1.3.3.tgz#8ed24c2c0205073339fafa004bc8c141fccb282e" dependencies: balanced-match "0.1.0" color "^0.11.0" - debug "~0.7.4" + debug "^3.1.0" rgb "~0.1.0" css-color-names@0.0.4: @@ -1867,9 +1867,11 @@ debug@2.6.9, debug@^2.1.1, debug@^2.2.0, debug@^2.6.6, debug@^2.6.8: dependencies: ms "2.0.0" -debug@~0.7.4: - version "0.7.4" - resolved "https://registry.yarnpkg.com/debug/-/debug-0.7.4.tgz#06e1ea8082c2cb14e39806e22e2f6f757f92af39" +debug@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261" + dependencies: + ms "2.0.0" decamelize@^1.0.0, decamelize@^1.1.1, decamelize@^1.1.2, decamelize@^1.2.0: version "1.2.0" @@ -1985,8 +1987,8 @@ diff@3.2.0: resolved "https://registry.yarnpkg.com/diff/-/diff-3.2.0.tgz#c9ce393a4b7cbd0b058a725c93df299027868ff9" diff@^3.1.0: - version "3.3.1" - resolved "https://registry.yarnpkg.com/diff/-/diff-3.3.1.tgz#aa8567a6eed03c531fc89d3f711cd0e5259dec75" + version "3.4.0" + resolved "https://registry.yarnpkg.com/diff/-/diff-3.4.0.tgz#b1d85507daf3964828de54b37d0d73ba67dda56c" diffie-hellman@^5.0.0: version "5.0.2" @@ -2123,9 +2125,9 @@ ejs@^2.5.6: 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.18: - version "1.3.24" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.24.tgz#9b7b88bb05ceb9fa016a177833cc2dde388f21b6" +electron-to-chromium@^1.2.7, electron-to-chromium@^1.3.24: + version "1.3.25" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.25.tgz#453b21009836d0997d86035601ff6cae4791c460" elliptic@^6.0.0: version "6.4.0" @@ -2242,8 +2244,8 @@ error-stack-parser@^2.0.0: stackframe "^1.0.3" es-abstract@^1.7.0: - version "1.8.2" - resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.8.2.tgz#25103263dc4decbda60e0c737ca32313518027ee" + version "1.9.0" + resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.9.0.tgz#690829a07cae36b222e7fd9b75c0d0573eb25227" dependencies: es-to-primitive "^1.1.1" function-bind "^1.1.1" @@ -2260,13 +2262,13 @@ es-to-primitive@^1.1.1: is-symbol "^1.0.1" es5-ext@^0.10.14, es5-ext@^0.10.9, es5-ext@~0.10.14: - version "0.10.30" - resolved "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.30.tgz#7141a16836697dbabfaaaeee41495ce29f52c939" + version "0.10.31" + resolved "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.31.tgz#7bb938c95a7f1b9f728092dc09c41edcc398eefe" dependencies: - es6-iterator "2" - es6-symbol "~3.1" + es6-iterator "~2.0.1" + es6-symbol "~3.1.1" -es6-iterator@2, es6-iterator@^2.0.1, es6-iterator@~2.0.1: +es6-iterator@^2.0.1, es6-iterator@~2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/es6-iterator/-/es6-iterator-2.0.1.tgz#8e319c9f0453bf575d374940a655920e59ca5512" dependencies: @@ -2299,7 +2301,7 @@ es6-set@~0.1.5: es6-symbol "3.1.1" event-emitter "~0.3.5" -es6-symbol@3.1.1, es6-symbol@^3.1, es6-symbol@^3.1.1, es6-symbol@~3.1, es6-symbol@~3.1.1: +es6-symbol@3.1.1, es6-symbol@^3.1, es6-symbol@^3.1.1, es6-symbol@~3.1.1: version "3.1.1" resolved "https://registry.yarnpkg.com/es6-symbol/-/es6-symbol-3.1.1.tgz#bf00ef4fdab6ba1b46ecb7b629b4c7ed5715cc77" dependencies: @@ -2619,8 +2621,8 @@ expand-tilde@^2.0.2: homedir-polyfill "^1.0.1" express@^4.13.3, express@^4.15.2: - version "4.16.0" - resolved "https://registry.yarnpkg.com/express/-/express-4.16.0.tgz#b519638e4eb58e7178c81b498ef22f798cb2e255" + version "4.16.2" + resolved "https://registry.yarnpkg.com/express/-/express-4.16.2.tgz#e35c6dfe2d64b7dca0a5cd4f21781be3299e076c" dependencies: accepts "~1.3.4" array-flatten "1.1.1" @@ -2645,8 +2647,8 @@ express@^4.13.3, express@^4.15.2: qs "6.5.1" range-parser "~1.2.0" safe-buffer "5.1.1" - send "0.16.0" - serve-static "1.13.0" + send "0.16.1" + serve-static "1.13.1" setprototypeof "1.1.0" statuses "~1.3.1" type-is "~1.6.15" @@ -2763,12 +2765,6 @@ file-entry-cache@^2.0.0: flat-cache "^1.2.1" object-assign "^4.0.1" -file-loader@^0.11.2: - version "0.11.2" - resolved "https://registry.yarnpkg.com/file-loader/-/file-loader-0.11.2.tgz#4ff1df28af38719a6098093b88c82c71d1794a34" - dependencies: - loader-utils "^1.0.2" - file-save@^0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/file-save/-/file-save-0.2.0.tgz#39b20d0214e656b1417faa3c32d317b678545db7" @@ -3608,8 +3604,8 @@ http-errors@1.6.2, http-errors@~1.6.2: statuses ">= 1.3.1 < 2" http-parser-js@>=0.4.0: - version "0.4.8" - resolved "https://registry.yarnpkg.com/http-parser-js/-/http-parser-js-0.4.8.tgz#763f75c4b771a0bb44653b07070bff6ca7bc5561" + version "0.4.9" + resolved "https://registry.yarnpkg.com/http-parser-js/-/http-parser-js-0.4.9.tgz#ea1a04fb64adff0242e9974f297dd4c3cad271e1" http-proxy-middleware@~0.17.4: version "0.17.4" @@ -4234,8 +4230,8 @@ karma-spec-reporter@^0.0.31: colors "^1.1.2" karma-webpack@^2.0.4: - version "2.0.4" - resolved "https://registry.yarnpkg.com/karma-webpack/-/karma-webpack-2.0.4.tgz#3e2d4f48ba94a878e1c66bb8e1ae6128987a175b" + version "2.0.5" + resolved "https://registry.yarnpkg.com/karma-webpack/-/karma-webpack-2.0.5.tgz#4f56887e32cf4f9583391c2388415de06af06efd" dependencies: async "~0.9.0" loader-utils "^0.2.5" @@ -4678,8 +4674,8 @@ log4js@^0.6.31: semver "~4.3.3" loglevel@^1.4.1: - version "1.5.0" - resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.5.0.tgz#3863984a2c326b986fbb965f378758a6dc8a4324" + version "1.5.1" + resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.5.1.tgz#189078c94ab9053ee215a0acdbf24244ea0f6502" lolex@^1.6.0: version "1.6.0" @@ -5590,8 +5586,8 @@ postcss-calc@^5.2.0: reduce-css-calc "^1.2.6" postcss-calc@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/postcss-calc/-/postcss-calc-6.0.0.tgz#b681b279c6d24fbe0e33ed9045803705445d613b" + version "6.0.1" + resolved "https://registry.yarnpkg.com/postcss-calc/-/postcss-calc-6.0.1.tgz#3d24171bbf6e7629d422a436ebfe6dd9511f4330" dependencies: css-unit-converter "^1.1.1" postcss "^6.0.0" @@ -5629,11 +5625,11 @@ postcss-custom-media@^6.0.0: postcss "^6.0.1" postcss-custom-properties@^6.1.0: - version "6.1.0" - resolved "https://registry.yarnpkg.com/postcss-custom-properties/-/postcss-custom-properties-6.1.0.tgz#9caf1151ac41b1e9e64d3a2ff9ece996ca18977d" + version "6.2.0" + resolved "https://registry.yarnpkg.com/postcss-custom-properties/-/postcss-custom-properties-6.2.0.tgz#5d929a7f06e9b84e0f11334194c0ba9a30acfbe9" dependencies: balanced-match "^1.0.0" - postcss "^6.0.3" + postcss "^6.0.13" postcss-custom-selectors@^4.0.1: version "4.0.1" @@ -5740,11 +5736,11 @@ postcss-load-plugins@^2.3.0: object-assign "^4.1.0" postcss-loader@^2.0.6: - version "2.0.6" - resolved "https://registry.yarnpkg.com/postcss-loader/-/postcss-loader-2.0.6.tgz#8c7e0055a3df1889abc6bad52dd45b2f41bbc6fc" + version "2.0.7" + resolved "https://registry.yarnpkg.com/postcss-loader/-/postcss-loader-2.0.7.tgz#4d2da1489cee0a14f72c0d9440c9ee7eded34345" dependencies: loader-utils "^1.1.0" - postcss "^6.0.2" + postcss "^6.0.0" postcss-load-config "^1.2.0" schema-utils "^0.3.0" @@ -5981,20 +5977,20 @@ postcss-zindex@^2.0.1: uniqs "^2.0.0" postcss@^5.0.10, postcss@^5.0.11, postcss@^5.0.12, postcss@^5.0.13, postcss@^5.0.14, postcss@^5.0.16, postcss@^5.0.2, postcss@^5.0.4, postcss@^5.0.5, postcss@^5.0.6, postcss@^5.0.8, postcss@^5.2.16: - version "5.2.17" - resolved "https://registry.yarnpkg.com/postcss/-/postcss-5.2.17.tgz#cf4f597b864d65c8a492b2eabe9d706c879c388b" + version "5.2.18" + resolved "https://registry.yarnpkg.com/postcss/-/postcss-5.2.18.tgz#badfa1497d46244f6390f58b319830d9107853c5" dependencies: chalk "^1.1.3" js-base64 "^2.1.9" source-map "^0.5.6" supports-color "^3.2.3" -postcss@^6.0.0, postcss@^6.0.1, postcss@^6.0.10, postcss@^6.0.11, postcss@^6.0.12, postcss@^6.0.2, postcss@^6.0.3, postcss@^6.0.6, postcss@^6.0.9: - version "6.0.12" - resolved "https://registry.yarnpkg.com/postcss/-/postcss-6.0.12.tgz#6b0155089d2d212f7bd6a0cecd4c58c007403535" +postcss@^6.0.0, postcss@^6.0.1, postcss@^6.0.10, postcss@^6.0.11, postcss@^6.0.12, postcss@^6.0.13, postcss@^6.0.3, postcss@^6.0.8, postcss@^6.0.9: + version "6.0.13" + resolved "https://registry.yarnpkg.com/postcss/-/postcss-6.0.13.tgz#b9ecab4ee00c89db3ec931145bd9590bbf3f125f" dependencies: chalk "^2.1.0" - source-map "^0.5.7" + source-map "^0.6.1" supports-color "^4.4.0" precss@2.0.0: @@ -6031,8 +6027,8 @@ preserve@^0.2.0: resolved "https://registry.yarnpkg.com/preserve/-/preserve-0.2.0.tgz#815ed1f6ebc65926f865b310c0713bcb3315ce4b" prettier@^1.7.0: - version "1.7.2" - resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.7.2.tgz#81371e64018aafc69cf1031956c70e029339f54e" + version "1.7.4" + resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.7.4.tgz#5e8624ae9363c80f95ec644584ecdf55d74f93fa" pretty-error@^2.0.2: version "2.1.1" @@ -6304,8 +6300,8 @@ reduce-css-calc@^1.2.6: reduce-function-call "^1.0.1" reduce-css-calc@^2.0.0: - version "2.0.5" - resolved "https://registry.yarnpkg.com/reduce-css-calc/-/reduce-css-calc-2.0.5.tgz#33c97838c5d4c711a5c14ef85ce4fde41483f7bd" + version "2.1.0" + resolved "https://registry.yarnpkg.com/reduce-css-calc/-/reduce-css-calc-2.1.0.tgz#a7a334e26631baf959bbe131ad8469ae443c408a" dependencies: css-unit-converter "^1.1.1" postcss-value-parser "^3.3.0" @@ -6506,7 +6502,7 @@ resolve@1.1.x: version "1.1.7" resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.1.7.tgz#203114d82ad2c5ed9e8e0411b3932875e889e97b" -resolve@^1.1.6, resolve@^1.1.7, resolve@^1.2.0, resolve@^1.3.3: +resolve@^1.1.6, resolve@^1.1.7, resolve@^1.2.0, resolve@^1.4.0: version "1.4.0" resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.4.0.tgz#a75be01c53da25d934a98ebd0e4c4a7312f92a86" dependencies: @@ -6568,8 +6564,8 @@ safe-buffer@~5.0.1: resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.0.1.tgz#d263ca54696cd8a306b5ca6551e92de57918fbe7" samsam@1.x, samsam@^1.1.3: - version "1.2.1" - resolved "https://registry.yarnpkg.com/samsam/-/samsam-1.2.1.tgz#edd39093a3184370cb859243b2bdf255e7d8ea67" + version "1.3.0" + resolved "https://registry.yarnpkg.com/samsam/-/samsam-1.3.0.tgz#8d1d9350e25622da30de3e44ba692b5221ab7c50" sax@^1.1.4, sax@~1.2.1: version "1.2.4" @@ -6599,9 +6595,9 @@ semver@^4.1.0, semver@~4.3.3: version "4.3.6" resolved "https://registry.yarnpkg.com/semver/-/semver-4.3.6.tgz#300bc6e0e86374f7ba61068b5b1ecd57fc6532da" -send@0.16.0: - version "0.16.0" - resolved "https://registry.yarnpkg.com/send/-/send-0.16.0.tgz#16338dbb9a2ede4ad57b48420ec3b82d8e80a57b" +send@0.16.1: + version "0.16.1" + resolved "https://registry.yarnpkg.com/send/-/send-0.16.1.tgz#a70e1ca21d1382c11d0d9f6231deb281080d7ab3" dependencies: debug "2.6.9" depd "~1.1.1" @@ -6633,14 +6629,14 @@ serve-index@^1.7.2: mime-types "~2.1.17" parseurl "~1.3.2" -serve-static@1.13.0: - version "1.13.0" - resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.13.0.tgz#810c91db800e94ba287eae6b4e06caab9fdc16f1" +serve-static@1.13.1: + version "1.13.1" + resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.13.1.tgz#4c57d53404a761d8f2e7c1e8a18a47dbf278a719" dependencies: encodeurl "~1.0.1" escape-html "~1.0.3" parseurl "~1.3.2" - send "0.16.0" + send "0.16.1" set-blocking@^2.0.0, set-blocking@~2.0.0: version "2.0.0" @@ -6820,7 +6816,7 @@ source-map@0.4.x, source-map@^0.4.4: dependencies: amdefine ">=0.0.4" -source-map@0.5.x, source-map@^0.5.0, source-map@^0.5.1, source-map@^0.5.3, source-map@^0.5.6, source-map@^0.5.7, source-map@~0.5.1, source-map@~0.5.3, source-map@~0.5.6: +source-map@0.5.x, source-map@^0.5.0, source-map@^0.5.1, source-map@^0.5.3, source-map@^0.5.6, source-map@~0.5.1, source-map@~0.5.3, source-map@~0.5.6: version "0.5.7" resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc" @@ -6830,6 +6826,10 @@ source-map@^0.1.41: dependencies: amdefine ">=0.0.4" +source-map@^0.6.1: + version "0.6.1" + resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263" + source-map@~0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.2.0.tgz#dab73fbcfc2ba819b4de03bd6f6eaa48164b3f9d" @@ -7210,8 +7210,8 @@ to-fast-properties@^1.0.3: resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-1.0.3.tgz#b83571fa4d8c25b82e231b06e3a3055de4ca1a47" toposort@^1.0.0: - version "1.0.4" - resolved "https://registry.yarnpkg.com/toposort/-/toposort-1.0.4.tgz#a86107690cbee8cae43b349d2f60162500924dfc" + version "1.0.6" + resolved "https://registry.yarnpkg.com/toposort/-/toposort-1.0.6.tgz#c31748e55d210effc00fdcdc7d6e68d7d7bb9cec" tough-cookie@^2.2.0, tough-cookie@~2.3.0, tough-cookie@~2.3.3: version "2.3.3" @@ -7279,8 +7279,8 @@ uc.micro@^1.0.1, uc.micro@^1.0.3: resolved "https://registry.yarnpkg.com/uc.micro/-/uc.micro-1.0.3.tgz#7ed50d5e0f9a9fb0a573379259f2a77458d50192" uglify-js@3.1.x: - version "3.1.2" - resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.1.2.tgz#b50bcf15a5fd9e9ed40afbcdef3b59d6891b291f" + version "3.1.3" + resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.1.3.tgz#d61f0453b4718cab01581f3162aa90bab7520b42" dependencies: commander "~2.11.0" source-map "~0.5.1" @@ -7529,30 +7529,30 @@ vue-add-globals@^1.0.1: resolved "https://registry.yarnpkg.com/vue-add-globals/-/vue-add-globals-1.0.1.tgz#151f241426e70cbc790a1f31bb0f4435d7575efc" vue-hot-reload-api@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/vue-hot-reload-api/-/vue-hot-reload-api-2.1.0.tgz#9ca58a6e0df9078554ce1708688b6578754d86de" + version "2.1.1" + resolved "https://registry.yarnpkg.com/vue-hot-reload-api/-/vue-hot-reload-api-2.1.1.tgz#1ba6712166182fd651753804b9d8d8d02d855579" vue-lazyload@^1.1.3: version "1.1.3" resolved "https://registry.yarnpkg.com/vue-lazyload/-/vue-lazyload-1.1.3.tgz#527a1e3e6ba6509fe27326d34f0ab9687c9a1e95" vue-loader@^13.0.4: - version "13.0.5" - resolved "https://registry.yarnpkg.com/vue-loader/-/vue-loader-13.0.5.tgz#3639e9fb3940cded7f0fc34429277fb6de70a57c" + version "13.2.1" + resolved "https://registry.yarnpkg.com/vue-loader/-/vue-loader-13.2.1.tgz#0c6cba3154d2b325d17dde2c0be52c34b888bc6d" dependencies: consolidate "^0.14.0" hash-sum "^1.0.2" loader-utils "^1.1.0" lru-cache "^4.1.1" - postcss "^6.0.6" + postcss "^6.0.8" postcss-load-config "^1.1.0" postcss-selector-parser "^2.0.0" prettier "^1.7.0" - resolve "^1.3.3" - source-map "^0.5.6" + resolve "^1.4.0" + source-map "^0.6.1" vue-hot-reload-api "^2.1.0" vue-style-loader "^3.0.0" - vue-template-es2015-compiler "^1.5.3" + vue-template-es2015-compiler "^1.6.0" vue-markdown-loader@^2.1.0: version "2.2.1" @@ -7588,9 +7588,9 @@ vue-template-compiler@^2.4.2: de-indent "^1.0.2" he "^1.1.0" -vue-template-es2015-compiler@^1.5.3: - version "1.5.3" - resolved "https://registry.yarnpkg.com/vue-template-es2015-compiler/-/vue-template-es2015-compiler-1.5.3.tgz#22787de4e37ebd9339b74223bc467d1adee30545" +vue-template-es2015-compiler@^1.5.3, vue-template-es2015-compiler@^1.6.0: + version "1.6.0" + resolved "https://registry.yarnpkg.com/vue-template-es2015-compiler/-/vue-template-es2015-compiler-1.6.0.tgz#dc42697133302ce3017524356a6c61b7b69b4a18" vue@^2.4.2: version "2.4.4" @@ -7913,9 +7913,9 @@ yeast@0.1.2: version "0.1.2" resolved "https://registry.yarnpkg.com/yeast/-/yeast-0.1.2.tgz#008e06d8094320c372dbc2f8ed76a0ca6c8ac419" -zan-doc@0.3.2: - version "0.3.2" - resolved "https://registry.yarnpkg.com/zan-doc/-/zan-doc-0.3.2.tgz#9493bc1d1a7e99f1316b8f47897de2dbf5b2bd0f" +zan-doc@^0.3.5: + version "0.3.5" + resolved "https://registry.yarnpkg.com/zan-doc/-/zan-doc-0.3.5.tgz#f0aa9cd3dcca524a58acd606d34dd17d223f4560" dependencies: cheerio "0.22.0" decamelize "^1.2.0"