diff --git a/packages/cell/demo/index.vue b/packages/cell/demo/index.vue
index 6a5892fa6..650f1d460 100644
--- a/packages/cell/demo/index.vue
+++ b/packages/cell/demo/index.vue
@@ -67,10 +67,6 @@ export default {
.demo-cell {
.van-cell-text {
margin-right: 5px;
- }
-
- .van-cell-text,
- .van-tag--danger {
vertical-align: middle;
}
}
diff --git a/packages/cell/test/__snapshots__/demo.spec.js.snap b/packages/cell/test/__snapshots__/demo.spec.js.snap
index 8668eb376..f62c79e34 100644
--- a/packages/cell/test/__snapshots__/demo.spec.js.snap
+++ b/packages/cell/test/__snapshots__/demo.spec.js.snap
@@ -86,7 +86,7 @@ exports[`renders demo correctly 1`] = `
-
单元格 标签
+
单元格 标签
内容
diff --git a/packages/tag/demo/index.vue b/packages/tag/demo/index.vue
index 3e4aeb13a..afdc6534f 100644
--- a/packages/tag/demo/index.vue
+++ b/packages/tag/demo/index.vue
@@ -9,12 +9,19 @@
{{ $t('tag') }}
- {{ $t('tag') }}
- {{ $t('tag') }}
+ {{ $t('tag') }}
+ {{ $t('tag') }}
{{ $t('tag') }}
+ {{ $t('tag') }}
+ {{ $t('tag') }}
+ {{ $t('tag') }}
+ {{ $t('tag') }}
+
+
+
{{ $t('tag') }}
{{ $t('tag') }}
{{ $t('tag') }}
@@ -36,11 +43,13 @@ export default {
'zh-CN': {
plain: '空心样式',
round: '圆角样式',
+ mark: '标记样式',
customColor: '自定义颜色'
},
'en-US': {
plain: 'Plain style',
- round: 'Mark style',
+ round: 'Round style',
+ mark: 'Mark style',
customColor: 'Custom Color'
}
}
diff --git a/packages/tag/en-US.md b/packages/tag/en-US.md
index b2aaf85d7..9f396abf6 100644
--- a/packages/tag/en-US.md
+++ b/packages/tag/en-US.md
@@ -27,6 +27,15 @@ Vue.use(Tag);
Tag
```
+#### Round style
+
+```html
+Tag
+Tag
+Tag
+Tag
+```
+
#### Mark style
```html
@@ -51,6 +60,7 @@ Vue.use(Tag);
|-----------|-----------|-----------|-------------|
| type | Type, can be set to `primary` `success` `danger` | `String` | `''`|
| plain | Whether to be plain style | `Boolean` | `false` |
+| round | Whether to be round style | `Boolean` | `false` |
| mark | Wtether to be mark style | `Boolean` | `false` |
### Slot
diff --git a/packages/tag/index.vue b/packages/tag/index.vue
index 27c2d8b71..9e0f7e274 100644
--- a/packages/tag/index.vue
+++ b/packages/tag/index.vue
@@ -3,7 +3,7 @@
:class="[b({
mark,
plain,
- [type]: type
+ round
}), {
'van-hairline--surround': plain
}]"
@@ -16,6 +16,13 @@