Merge branch 'dev' into feature/vant_cli_2

This commit is contained in:
陈嘉涵
2019-12-09 15:01:12 +08:00
30 changed files with 202 additions and 127 deletions
+3 -2
View File
@@ -42,7 +42,7 @@
@font-size-md: 14px;
@font-size-lg: 16px;
@font-weight-bold: 500;
@price-integer-font-family: Avenir-Heavy PingFang SC, Helvetica Neue, Arial, sans-serif;
@price-integer-font-family: Avenir-Heavy, PingFang SC, Helvetica Neue, Arial, sans-serif;
// Animation
@animation-duration-base: .3s;
@@ -84,7 +84,7 @@
@address-edit-detail-finish-font-size: @font-size-sm;
// AddressList
@address-list-padding: 12px 7px 100px 17px;
@address-list-padding: 12px 12px 100px;
@address-list-disabled-text-color: @gray-6;
@address-list-disabled-text-padding: @padding-base * 5 0 @padding-md;
@address-list-disabled-text-font-size: @font-size-md;
@@ -148,6 +148,7 @@
@card-origin-price-color: @gray-6;
@card-num-color: @gray-6;
@card-origin-price-font-size: @font-size-xs;
@card-price-font-size: @font-size-sm;
@card-price-integer-font-size: @font-size-lg;
@card-price-font-family: @price-integer-font-family;