From 161b5980ebbdff1866ef84ad606d3b23ace09697 Mon Sep 17 00:00:00 2001 From: neverland Date: Fri, 30 Apr 2021 21:53:23 +0800 Subject: [PATCH] fix(SubmitBar): @submit-bar-price-font-size not work (#8639) --- src/submit-bar/README.md | 15 +++++++-------- src/submit-bar/README.zh-CN.md | 3 +-- src/submit-bar/index.less | 2 +- src/submit-bar/var.less | 1 + 4 files changed, 10 insertions(+), 11 deletions(-) diff --git a/src/submit-bar/README.md b/src/submit-bar/README.md index 27a6e1591..6222c8c88 100644 --- a/src/submit-bar/README.md +++ b/src/submit-bar/README.md @@ -39,7 +39,7 @@ export default { ### Disabled -`submit` event will not triggerd when disabled. +`submit` event will not triggered when disabled. ```html @@ -93,7 +93,7 @@ export default { | Attribute | Description | Type | Default | | --- | --- | --- | --- | | price | Price | _number_ | - | -| decimal-length | Price dicemal length | _number \| string_ | `2` | +| decimal-length | Price decimal length | _number \| string_ | `2` | | label | Price left label | _string_ | `Total:` | | suffix-label | Price right label | _string_ | - | | text-align | Price label text align can be set to `left` | _string_ | `right` | @@ -109,9 +109,9 @@ export default { ### Events -| Event | Description | Arguments | -| ------ | --------------------------------- | --------- | -| submit | Triggerd when click submit button | - | +| Event | Description | Arguments | +| ------ | ---------------------------------- | --------- | +| submit | Triggered when click submit button | - | ### Slots @@ -133,8 +133,6 @@ How to use: [Custom Theme](#/en-US/theme). | @submit-bar-background-color | `@white` | - | | @submit-bar-button-width | `110px` | - | | @submit-bar-price-color | `@red` | - | -| @submit-bar-price-font-size | `@font-size-md` | - | -| @submit-bar-currency-font-size | `@font-size-md` | - | | @submit-bar-text-color | `@text-color` | - | | @submit-bar-text-font-size | `@font-size-md` | - | | @submit-bar-tip-padding | `@padding-xs @padding-sm` | - | @@ -145,5 +143,6 @@ How to use: [Custom Theme](#/en-US/theme). | @submit-bar-tip-icon-size | `12px` | - | | @submit-bar-button-height | `40px` | - | | @submit-bar-padding | `0 @padding-md` | - | +| @submit-bar-price-font-size | `@font-size-sm` | - | | @submit-bar-price-integer-font-size | `20px` | - | | @submit-bar-price-font-family | `@price-integer-font-family` | - | diff --git a/src/submit-bar/README.zh-CN.md b/src/submit-bar/README.zh-CN.md index d8f0613d5..c39d4cee8 100644 --- a/src/submit-bar/README.zh-CN.md +++ b/src/submit-bar/README.zh-CN.md @@ -140,8 +140,6 @@ export default { | @submit-bar-background-color | `@white` | - | | @submit-bar-button-width | `110px` | - | | @submit-bar-price-color | `@red` | - | -| @submit-bar-price-font-size | `@font-size-md` | - | -| @submit-bar-currency-font-size | `@font-size-md` | - | | @submit-bar-text-color | `@text-color` | - | | @submit-bar-text-font-size | `@font-size-md` | - | | @submit-bar-tip-padding | `@padding-xs @padding-sm` | - | @@ -152,5 +150,6 @@ export default { | @submit-bar-tip-icon-size | `12px` | - | | @submit-bar-button-height | `40px` | - | | @submit-bar-padding | `0 @padding-md` | - | +| @submit-bar-price-font-size | `@font-size-sm` | - | | @submit-bar-price-integer-font-size | `20px` | - | | @submit-bar-price-font-family | `@price-integer-font-family` | - | diff --git a/src/submit-bar/index.less b/src/submit-bar/index.less index a1ab0acb7..8ae7afcee 100644 --- a/src/submit-bar/index.less +++ b/src/submit-bar/index.less @@ -57,7 +57,7 @@ &__price { color: @submit-bar-price-color; font-weight: @font-weight-bold; - font-size: @font-size-sm; + font-size: @submit-bar-price-font-size; &-integer { font-size: @submit-bar-price-integer-font-size; diff --git a/src/submit-bar/var.less b/src/submit-bar/var.less index 961291964..d5d6c2b52 100644 --- a/src/submit-bar/var.less +++ b/src/submit-bar/var.less @@ -17,5 +17,6 @@ @submit-bar-tip-icon-size: 12px; @submit-bar-button-height: 40px; @submit-bar-padding: 0 @padding-md; +@submit-bar-price-font-size: @font-size-sm; @submit-bar-price-integer-font-size: 20px; @submit-bar-price-font-family: @price-integer-font-family;