From 1e524426565718f751e51aeb96ee0b3803bf4c25 Mon Sep 17 00:00:00 2001 From: xuxiaoyan Date: Thu, 6 Dec 2018 16:23:49 +0800 Subject: [PATCH] fix(tag): update style & add prop sharp --- components/tag/README.en-US.md | 13 +++++++------ components/tag/README.md | 1 + components/tag/index.vue | 2 +- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/components/tag/README.en-US.md b/components/tag/README.en-US.md index a60de945..bdc25530 100644 --- a/components/tag/README.en-US.md +++ b/components/tag/README.en-US.md @@ -21,9 +21,10 @@ Vue.component(Tag.name, Tag) #### Tag Props | Props | Description | Type | Default | Value | |----|-----|------|------|------| -|size| The size of tag |String|`large`|`tiny`, `small`, `large`| -|shape| The shape of tag |String|`square`|`square`, `circle`, `fillet`, `quarter`, `coupon`| -|type| The style of tag |String|`ghost`|`fill`, `ghost`| -|fill-color| Background color, `rgba` or `hex number`|String|`rgba(0,0,0,0)`|-| -|font-weight| Font weight |String|`normal`|`normal`, `bold`, `bolder`| -|font-color| Font color, `rgba` or `hex number`|String|`#fc9153`|-| +|size| size of tag |String|`large`|`tiny`, `small`, `large`| +|shape| shape of tag |String|`square`|`square`, `circle`, `fillet`, `quarter`, `coupon`| +|sharp|angle of tag|String|-|`top-left`, `top-right`, `bottom-left`, `bottom-right`| +|type| style of tag |String|`ghost`|`fill`, `ghost`| +|fill-color| background color, `rgba` or `hex number`|String|`rgba(0,0,0,0)`|-| +|font-weight| font weight |String|`normal`|`normal`, `bold`, `bolder`| +|font-color| font color, `rgba` or `hex number`|String|`#fc9153`|-| diff --git a/components/tag/README.md b/components/tag/README.md index 70904032..ae497fc7 100644 --- a/components/tag/README.md +++ b/components/tag/README.md @@ -23,6 +23,7 @@ Vue.component(Tag.name, Tag) |----|-----|------|------|------| |size|标签大小|String|`large`|`tiny`, `small`, `large`| |shape|标签形状|String|`square`|`square`, `circle`, `fillet`, `quarter`, `coupon`| +|sharp|标签尖角|String|-|`top-left`, `top-right`, `bottom-left`, `bottom-right`| |type|标签样式|String|`ghost`|`fill`(填充), `ghost`(线框)| |fill-color|标签颜色`rgba` or `hex number`|String|`rgba(0,0,0,0)`|-| |font-weight|字体粗细|String|`normal`|`normal`, `bold`, `bolder`| diff --git a/components/tag/index.vue b/components/tag/index.vue index cef18f38..d330de48 100644 --- a/components/tag/index.vue +++ b/components/tag/index.vue @@ -207,7 +207,7 @@ export default { width 5px .shape-bubble - width 53px + width 50px padding 6px 0 border-radius radius-circle border-bottom-left-radius 0