diff --git a/packages/badge/demo/index.vue b/packages/badge/demo/index.vue index 786cd17c3..cfa9d9cf8 100644 --- a/packages/badge/demo/index.vue +++ b/packages/badge/demo/index.vue @@ -16,7 +16,7 @@ /> diff --git a/packages/badge/en-US.md b/packages/badge/en-US.md index da518d740..d4f9ea2a6 100644 --- a/packages/badge/en-US.md +++ b/packages/badge/en-US.md @@ -18,7 +18,7 @@ Use `active-key` prop to set index of chosen 'badge' - + ``` diff --git a/packages/badge/index.less b/packages/badge/index.less index c093fa976..795494c6c 100644 --- a/packages/badge/index.less +++ b/packages/badge/index.less @@ -13,6 +13,10 @@ background-color: @background-color; border-left: 3px solid transparent; + &__text { + position: relative; + } + &:active { background-color: @active-color; } @@ -36,11 +40,7 @@ } } - &__info { - top: 7px; - left: auto; - right: 5px; - font-size: 12px; - transform: scale(0.9); + .van-info { + right: 4px; } } diff --git a/packages/badge/index.vue b/packages/badge/index.vue index 174b60580..846a4e89f 100644 --- a/packages/badge/index.vue +++ b/packages/badge/index.vue @@ -4,11 +4,13 @@ :href="url" @click="onClick" > - - {{ title }} +
+ {{ title }} + +
diff --git a/packages/badge/test/__snapshots__/demo.spec.js.snap b/packages/badge/test/__snapshots__/demo.spec.js.snap index 688ec8e78..392ccc8d6 100644 --- a/packages/badge/test/__snapshots__/demo.spec.js.snap +++ b/packages/badge/test/__snapshots__/demo.spec.js.snap @@ -5,26 +5,34 @@ exports[`renders demo correctly 1`] = `
- - 标签名称 +
+ 标签名称 + +
-
- 8 +
+ 标签名称 +
+ 8 +
- 标签名称
- diff --git a/packages/badge/zh-CN.md b/packages/badge/zh-CN.md index 30c85f025..5d33fef28 100644 --- a/packages/badge/zh-CN.md +++ b/packages/badge/zh-CN.md @@ -19,7 +19,7 @@ Vue.use(BadgeGroup); - + ``` diff --git a/packages/info/index.less b/packages/info/index.less index 9e9c24c53..b4815dc67 100644 --- a/packages/info/index.less +++ b/packages/info/index.less @@ -1,19 +1,30 @@ @import '../style/var'; +@van-info-size: 16px; +@van-info-color: @white; +@van-info-padding: 0 3px; +@van-info-font-size: 12px; +@van-info-font-weight: 500; +@van-info-border-width: 1px; +@van-info-background-color: @red; +@van-info-font-family: PingFang SC, Helvetica Neue, Arial, sans-serif; + .van-info { - left: 100%; - top: -.5em; - color: @white; - font-size: .6em; - font-weight: 500; - padding: 0 .25em; - text-align: center; - min-width: 1.4em; - line-height: 1.4; position: absolute; - border-radius: .7em; + right: 0; + top: -@van-info-size / 2; + color: @van-info-color; + font-size: @van-info-font-size; + font-weight: @van-info-font-weight; + font-family: @van-info-font-family; + text-align: center; box-sizing: border-box; - background-color: @red; - transform: translateX(-50%); - font-family: PingFang SC, Helvetica Neue, Arial, sans-serif; + padding: @van-info-padding; + min-width: @van-info-size; + line-height: @van-info-size - @van-info-border-width * 2; + border: @van-info-border-width solid @white; + border-radius: @van-info-size; + background-color: @van-info-background-color; + transform: translateX(50%); + transform-origin: 100%; }