Skip to content

Commit

Permalink
feat(AddressEdit): add address-edit-button-font-size var (#9113)
Browse files Browse the repository at this point in the history
  • Loading branch information
chenjiahan committed Jul 24, 2021
1 parent 0d6d7ce commit 3940306
Show file tree
Hide file tree
Showing 10 changed files with 17 additions and 10 deletions.
2 changes: 2 additions & 0 deletions src/address-edit/AddressEdit.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -401,13 +401,15 @@ export default defineComponent({
round
type="danger"
text={props.saveButtonText || t('save')}
class={bem('button')}
loading={props.isSaving}
onClick={onSave}
/>
{props.showDelete && (
<Button
block
round
class={bem('button')}
loading={props.isDeleting}
text={props.deleteButtonText || t('delete')}
onClick={onDelete}
Expand Down
1 change: 1 addition & 0 deletions src/address-edit/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -160,5 +160,6 @@ The component provides the following CSS variables, which can be used to customi
| --van-address-edit-padding | _var(--van-padding-sm)_ | - |
| --van-address-edit-buttons-padding | _var(--van-padding-xl) var(--van-padding-base)_ | - |
| --van-address-edit-button-margin-bottom | _var(--van-padding-sm)_ | - |
| --van-address-edit-button-font-size | _var(--van-font-size-lg)_ | - |
| --van-address-edit-detail-finish-color | _var(--van-primary-color)_ | - |
| --van-address-edit-detail-finish-font-size | _var(--van-font-size-sm)_ | - |
1 change: 1 addition & 0 deletions src/address-edit/README.zh-CN.md
Original file line number Diff line number Diff line change
Expand Up @@ -162,5 +162,6 @@ export default {
| --van-address-edit-padding | _var(--van-padding-sm)_ | - |
| --van-address-edit-buttons-padding | _var(--van-padding-xl) var(--van-padding-base)_ | - |
| --van-address-edit-button-margin-bottom | _var(--van-padding-sm)_ | - |
| --van-address-edit-button-font-size | _var(--van-font-size-lg)_ | - |
| --van-address-edit-detail-finish-color | _var(--van-primary-color)_ | - |
| --van-address-edit-detail-finish-font-size | _var(--van-font-size-sm)_ | - |
8 changes: 5 additions & 3 deletions src/address-edit/index.less
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
--van-address-edit-padding: @address-edit-padding;
--van-address-edit-buttons-padding: @address-edit-buttons-padding;
--van-address-edit-button-margin-bottom: @address-edit-button-margin-bottom;
--van-contact-edit-button-font-size: @address-edit-button-font-size;
--van-address-edit-detail-finish-color: @address-edit-detail-finish-color;
--van-address-edit-detail-finish-font-size: @address-edit-detail-finish-font-size;
}
Expand All @@ -28,10 +29,11 @@

&__buttons {
padding: var(--van-address-edit-buttons-padding);
}

.van-button {
margin-bottom: var(--van-address-edit-button-margin-bottom);
}
&__button {
margin-bottom: var(--van-address-edit-button-margin-bottom);
font-size: var(--van-address-edit-button-font-size);
}

&-detail {
Expand Down
4 changes: 2 additions & 2 deletions src/address-edit/test/__snapshots__/demo.spec.ts.snap
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ exports[`should render demo and match snapshot 1`] = `
</div>
<div class="van-address-edit__buttons">
<button type="button"
class="van-button van-button--danger van-button--normal van-button--block van-button--round"
class="van-button van-button--danger van-button--normal van-button--block van-button--round van-address-edit__button"
>
<div class="van-button__content">
<span class="van-button__text">
Expand All @@ -116,7 +116,7 @@ exports[`should render demo and match snapshot 1`] = `
</div>
</button>
<button type="button"
class="van-button van-button--default van-button--normal van-button--block van-button--round"
class="van-button van-button--default van-button--normal van-button--block van-button--round van-address-edit__button"
>
<div class="van-button__content">
<span class="van-button__text">
Expand Down
4 changes: 2 additions & 2 deletions src/address-edit/test/__snapshots__/index.spec.js.snap
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ exports[`should render AddressEdit correctly 1`] = `
</div>
<div class="van-address-edit__buttons">
<button type="button"
class="van-button van-button--danger van-button--normal van-button--block van-button--round"
class="van-button van-button--danger van-button--normal van-button--block van-button--round van-address-edit__button"
>
<div class="van-button__content">
<span class="van-button__text">
Expand Down Expand Up @@ -198,7 +198,7 @@ exports[`should render AddressEdit with props correctly 1`] = `
</div>
<div class="van-address-edit__buttons">
<button type="button"
class="van-button van-button--danger van-button--normal van-button--block van-button--round"
class="van-button van-button--danger van-button--normal van-button--block van-button--round van-address-edit__button"
>
<div class="van-button__content">
<span class="van-button__text">
Expand Down
1 change: 1 addition & 0 deletions src/address-edit/var.less
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,6 @@
@address-edit-padding: var(--van-padding-sm);
@address-edit-buttons-padding: var(--van-padding-xl) var(--van-padding-base);
@address-edit-button-margin-bottom: var(--van-padding-sm);
@address-edit-button-font-size: var(--van-font-size-lg);
@address-edit-detail-finish-color: var(--van-primary-color);
@address-edit-detail-finish-font-size: var(--van-font-size-sm);
2 changes: 1 addition & 1 deletion src/contact-edit/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -87,5 +87,5 @@ The component provides the following CSS variables, which can be used to customi
| --van-contact-edit-fields-radius | _var(--van-border-radius-md)_ | - |
| --van-contact-edit-buttons-padding | _var(--van-padding-xl) 0_ | - |
| --van-contact-edit-button-margin-bottom | _var(--van-padding-sm)_ | - |
| --van-contact-edit-button-font-size | _16px_ | - |
| --van-contact-edit-button-font-size | _var(--van-font-size-lg)_ | - |
| --van-contact-edit-field-label-width | _4.1em_ | - |
2 changes: 1 addition & 1 deletion src/contact-edit/README.zh-CN.md
Original file line number Diff line number Diff line change
Expand Up @@ -87,5 +87,5 @@ export default {
| --van-contact-edit-fields-radius | _var(--van-border-radius-md)_ | - |
| --van-contact-edit-buttons-padding | _var(--van-padding-xl) 0_ | - |
| --van-contact-edit-button-margin-bottom | _var(--van-padding-sm)_ | - |
| --van-contact-edit-button-font-size | _16px_ | - |
| --van-contact-edit-button-font-size | _var(--van-font-size-lg)_ | - |
| --van-contact-edit-field-label-width | _4.1em_ | - |
2 changes: 1 addition & 1 deletion src/contact-edit/var.less
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@
@contact-edit-fields-radius: var(--van-border-radius-md);
@contact-edit-buttons-padding: var(--van-padding-xl) 0;
@contact-edit-button-margin-bottom: var(--van-padding-sm);
@contact-edit-button-font-size: 16px;
@contact-edit-button-font-size: var(--van-font-size-lg);
@contact-edit-field-label-width: 4.1em;

0 comments on commit 3940306

Please sign in to comment.