diff --git a/docs/demos/views/sku.vue b/docs/demos/views/sku.vue index e46eb8204..8810988a3 100644 --- a/docs/demos/views/sku.vue +++ b/docs/demos/views/sku.vue @@ -61,7 +61,7 @@ > - ¥{{ props.price }} only!!! + ¥{{ props.price }} diff --git a/docs/markdown/en-US/sku.md b/docs/markdown/en-US/sku.md index b1a5ec87d..263e8d689 100644 --- a/docs/markdown/en-US/sku.md +++ b/docs/markdown/en-US/sku.md @@ -67,7 +67,7 @@ Vue.use(Sku); - ¥{{ props.price }} only!!! + ¥{{ props.price }} diff --git a/docs/markdown/zh-CN/sku.md b/docs/markdown/zh-CN/sku.md index b3a7a6bb5..14407ee7b 100644 --- a/docs/markdown/zh-CN/sku.md +++ b/docs/markdown/zh-CN/sku.md @@ -67,7 +67,7 @@ Vue.use(Sku); - ¥{{ props.price }} only!!! + ¥{{ props.price }} diff --git a/packages/checkbox/index.vue b/packages/checkbox/index.vue index fc0252e84..834acc99b 100644 --- a/packages/checkbox/index.vue +++ b/packages/checkbox/index.vue @@ -1,16 +1,16 @@ - + - + diff --git a/packages/circle/index.vue b/packages/circle/index.vue index f376c411c..728280a9a 100644 --- a/packages/circle/index.vue +++ b/packages/circle/index.vue @@ -5,7 +5,7 @@ - {{ text }} + {{ text }} diff --git a/packages/pagination/index.vue b/packages/pagination/index.vue index 3150a8a7a..cfb5501f7 100644 --- a/packages/pagination/index.vue +++ b/packages/pagination/index.vue @@ -1,8 +1,8 @@ - + {{ prevText || $t('prev') }} @@ -10,18 +10,18 @@ {{ page.text }} - + {{ pageDesc }} {{ nextText || $t('next') }} diff --git a/packages/radio/index.vue b/packages/radio/index.vue index dcbdeeff1..53c132036 100644 --- a/packages/radio/index.vue +++ b/packages/radio/index.vue @@ -1,6 +1,6 @@ - + - + - - + + - + {{ goods.title }} diff --git a/packages/sku/components/SkuImgUploader.vue b/packages/sku/components/SkuImgUploader.vue index 502d0df92..1dbb49f16 100644 --- a/packages/sku/components/SkuImgUploader.vue +++ b/packages/sku/components/SkuImgUploader.vue @@ -1,14 +1,13 @@ - + - + {{ $t('uploading') }} @@ -23,15 +22,15 @@ - + - + - + diff --git a/packages/sku/components/SkuMessages.vue b/packages/sku/components/SkuMessages.vue index 80fa85459..6ee47962e 100644 --- a/packages/sku/components/SkuMessages.vue +++ b/packages/sku/components/SkuMessages.vue @@ -1,9 +1,9 @@ - + - - {{ skuRow.k }}: + + {{ skuRow.k }}: diff --git a/packages/switch-cell/index.vue b/packages/switch-cell/index.vue index c47e9ae52..6c1f38f6e 100644 --- a/packages/switch-cell/index.vue +++ b/packages/switch-cell/index.vue @@ -1,5 +1,5 @@ - + diff --git a/packages/switch/index.vue b/packages/switch/index.vue index f27730b12..32e705a00 100644 --- a/packages/switch/index.vue +++ b/packages/switch/index.vue @@ -1,15 +1,14 @@ - - + + diff --git a/packages/tab/index.vue b/packages/tab/index.vue index 45eed1fbd..176382069 100644 --- a/packages/tab/index.vue +++ b/packages/tab/index.vue @@ -1,5 +1,5 @@ - + diff --git a/packages/tabbar-item/index.vue b/packages/tabbar-item/index.vue index 4e8815764..259e9eafd 100644 --- a/packages/tabbar-item/index.vue +++ b/packages/tabbar-item/index.vue @@ -1,12 +1,12 @@ - - + + {{ info }} - + diff --git a/packages/tabbar/index.vue b/packages/tabbar/index.vue index 4726734ce..b2c425aa0 100644 --- a/packages/tabbar/index.vue +++ b/packages/tabbar/index.vue @@ -1,5 +1,5 @@ - + diff --git a/packages/tabs/index.vue b/packages/tabs/index.vue index e0bc80de1..1ad7c2f03 100644 --- a/packages/tabs/index.vue +++ b/packages/tabs/index.vue @@ -1,15 +1,14 @@ - + - - + + - + diff --git a/packages/tag/index.vue b/packages/tag/index.vue index b7cd1a906..2cbb2864d 100644 --- a/packages/tag/index.vue +++ b/packages/tag/index.vue @@ -1,11 +1,11 @@ diff --git a/packages/toast/toast.vue b/packages/toast/toast.vue index 40789632c..e1336260e 100644 --- a/packages/toast/toast.vue +++ b/packages/toast/toast.vue @@ -1,6 +1,6 @@ - + {{ message }} @@ -8,8 +8,8 @@ - - {{ message }} + + {{ message }} diff --git a/packages/tree-select/index.vue b/packages/tree-select/index.vue index a2fe3402b..249c93953 100644 --- a/packages/tree-select/index.vue +++ b/packages/tree-select/index.vue @@ -1,26 +1,26 @@ - - + + {{ item.text }} - + {{ item.text }} diff --git a/packages/vant-css/src/pagination.css b/packages/vant-css/src/pagination.css index 2a8d0a681..2668b0f16 100644 --- a/packages/vant-css/src/pagination.css +++ b/packages/vant-css/src/pagination.css @@ -28,31 +28,27 @@ &:last-child::after { border-right-width: 1px; } - } - &__prev, - &__next { - &.van-pagination__item { - padding: 0 5px; - } - } - - &__page { - flex-grow: 0; - - &.van-pagination--active { - background-color: $blue; - color: $white; - } - } - - &--disabled { - - &.van-pagination__item { + &--disabled, + &--disabled:active { background-color: $background-color; color: $gray-darker; opacity: 0.6; } + + &--active { + color: $white; + background-color: $blue; + } + } + + &__prev, + &__next { + padding: 0 5px; + } + + &__page { + flex-grow: 0; } &__page-desc { @@ -60,15 +56,13 @@ height: 40px; color: $gray-darker; } -} -.van-pagination-simple { - - .van-pagination__prev, - .van-pagination__next { - - &.van-pagination__item::after { - border-width: 1px; + &--simple { + .van-pagination__prev, + .van-pagination__next { + &::after { + border-width: 1px; + } } } } diff --git a/packages/vant-css/src/tab.css b/packages/vant-css/src/tab.css index 413ca3706..c9f80b2db 100644 --- a/packages/vant-css/src/tab.css +++ b/packages/vant-css/src/tab.css @@ -22,6 +22,22 @@ $van-tabs-card-height: 30px; top: auto; bottom: 0; } + + &--scrollable { + .van-tab { + flex: 0 0 22%; + } + + .van-tabs__nav { + overflow: hidden; + overflow-x: auto; + -webkit-overflow-scrolling: touch; + + &::-webkit-scrollbar { + display: none; + } + } + } } &__nav { @@ -69,22 +85,6 @@ $van-tabs-card-height: 30px; background-color: $red; } - &--scrollable { - .van-tab { - flex: 0 0 22%; - } - - .van-tabs__nav { - overflow: hidden; - overflow-x: auto; - -webkit-overflow-scrolling: touch; - - &::-webkit-scrollbar { - display: none; - } - } - } - &--line { padding-top: $van-tabs-line-height; diff --git a/packages/vant-css/src/tabbar.css b/packages/vant-css/src/tabbar.css index 4a2c82f33..8551a4955 100644 --- a/packages/vant-css/src/tabbar.css +++ b/packages/vant-css/src/tabbar.css @@ -31,7 +31,7 @@ display: block; } - &-dot { + &--dot { &::after { top: 0; right: -8px; diff --git a/test/specs/pagination.spec.js b/test/specs/pagination.spec.js index 1e5828221..431cfb30d 100644 --- a/test/specs/pagination.spec.js +++ b/test/specs/pagination.spec.js @@ -38,7 +38,7 @@ describe('Pagination', () => { expect( wrapper .find('.van-pagination__next')[0] - .hasClass('van-pagination--disabled') + .hasClass('van-pagination__item--disabled') ).to.be.true; done(); });