feat: 字体\行高\icon统一处理

Author: irisSong

src/packages/avatarcropper/avatarcropper.taro.tsx

@@ -693,5 +693,4 @@ export const AvatarCropper: FunctionComponent<
     </>
   )
 }
-
 AvatarCropper.displayName = 'NutAvatarCropper'

src/packages/calendarcard/calendarcard.scss

@@ -3,6 +3,7 @@
   border-radius: 12px;
   overflow: hidden;
   font-size: $calendar-base-font-size;
+  line-height: $line-height-l;
   line-height: $calendar-base-font-size;
   color: $color-title;
 
@@ -19,7 +20,6 @@
       flex-direction: row;
       cursor: pointer;
       margin: 16px;
-      line-height: 1;
 
       .left {
         margin-left: 8px;

src/packages/card/card.scss

@@ -27,7 +27,7 @@
 
     &-title {
       @include moreline-ellipsis();
-      line-height: 1.5;
+      line-height: $line-height-xl;
       font-size: $font-size-base;
       color: $color-title;
     }
@@ -69,7 +69,7 @@
       align-items: center;
 
       &-name {
-        line-height: 1.5;
+        line-height: $line-height-xl;
         color: $color-text;
         font-size: $font-size-s;
         padding-top: 4px;

src/packages/checkbox/checkbox.scss

@@ -103,10 +103,10 @@
       bottom: 0;
       width: 0;
       height: 0;
-      border-top: scale-icon-px(10px) solid transparent;
-      border-left: scale-icon-px(10px) solid transparent;
-      border-bottom: scale-icon-px(10px) solid $color-primary;
-      border-right: scale-icon-px(10px) solid $color-primary;
+      border-top: $icon-size-10 solid transparent;
+      border-left: $icon-size-10 solid transparent;
+      border-bottom: $icon-size-10 solid $color-primary;
+      border-right: $icon-size-10 solid $color-primary;
       display: flex;
       align-items: flex-end;
       justify-content: flex-end;

src/packages/hoverbuttonitem/hoverbuttonitem.scss

@@ -44,7 +44,7 @@
       display: block;
       width: 20px;
       height: 20px;
-      font-size: scale-font-px(20px);
+      font-size: $font-size-2xl;
     }
   }
 

src/packages/lottie/lottiemp.taro.tsx

@@ -20,14 +20,12 @@ export const Lottie = React.forwardRef((props: TaroLottieProps, ref: any) => {
     speed = 1,
     dpr = true,
   } = props
-
   const setSpeed = () => {
     if (animation.current) {
       animation.current.setSpeed(Math.abs(speed))
       animation.current.setDirection(speed > 0 ? 1 : -1)
     }
   }
-
   useImperativeHandle(ref, () => animation.current || {})
   const pixelRatio = useRef(getWindowInfo().pixelRatio)
   useReady(() => {
@@ -75,7 +73,6 @@ export const Lottie = React.forwardRef((props: TaroLottieProps, ref: any) => {
       )
       .exec()
   })
-
   useUnload(() => {
     onComplete &&
       animation.current &&

src/packages/menu/menu.scss

@@ -42,8 +42,8 @@
   }
 
   &-icon {
-    width: scale-icon-px(12px);
-    height: scale-icon-px(12px);
+    width: $icon-size-12;
+    height: $icon-size-12;
     flex-shrink: 0;
     transition: all 0.2s linear;
   }

src/packages/navbar/navbar.scss

@@ -73,7 +73,7 @@
     .nutui-iconfont {
       width: 20px;
       height: 20px;
-      font-size: scale-font-px(20px);
+      font-size: $font-size-2xl;
     }
 
     /* #endif */

src/packages/numberkeyboard/numberkeyboard.scss

@@ -2,8 +2,8 @@
 
 .nut-numberkeyboard {
   &-close-icon {
-    width: scale-icon-px(18px);
-    height: scale-icon-px(18px);
+    width: $icon-size-18;
+    height: $icon-size-18;
   }
 
   width: 100%;

src/packages/price/price.scss

@@ -1,6 +1,7 @@
 .nut-price {
   direction: ltr;
   font-size: $font-size-l;
+  line-height: $price-root-line-height;
   display: flex;
   flex-direction: row;
   align-items: baseline;
@@ -17,7 +18,6 @@
       &-symbol,
       &-integer,
       &-decimal {
-        font-family: 'JDZH-Bold';
         color: $price-darkgray-color;
       }
     }
@@ -28,7 +28,6 @@
       &-symbol,
       &-integer,
       &-decimal {
-        font-family: 'JDZH-Bold';
         color: $price-primary-color;
       }
     }
@@ -38,22 +37,22 @@
     padding-right: $price-symbol-padding-right;
     &-xlarge {
       font-size: $price-symbol-xlarge-size;
-      line-height: $price-symbol-xlarge-size;
+      line-height: $price-minor-line-height;
     }
 
     &-large {
       font-size: $price-symbol-large-size;
-      line-height: $price-symbol-large-size;
+      line-height: $price-minor-line-height;
     }
 
     &-normal {
       font-size: $price-symbol-normal-size;
-      line-height: $price-symbol-normal-size;
+      line-height: $price-minor-line-height;
     }
 
     &-small {
       font-size: $price-symbol-small-size;
-      line-height: $price-symbol-small-size;
+      line-height: $price-minor-line-height;
     }
 
     &-rtl {
@@ -65,44 +64,44 @@
   &-integer {
     &-xlarge {
       font-size: $price-integer-xlarge-size;
-      line-height: $price-integer-xlarge-size;
+      line-height: $price-integer-xlarge-line-height;
     }
 
     &-large {
       font-size: $price-integer-large-size;
-      line-height: $price-integer-large-size;
+      line-height: $price-integer-large-line-height;
     }
 
     &-normal {
       font-size: $price-integer-normal-size;
-      line-height: $price-integer-normal-size;
+      line-height: $price-integer-normal-line-height;
     }
 
     &-small {
       font-size: $price-integer-small-size;
-      line-height: $price-integer-small-size;
+      line-height: $price-integer-small-line-height;
     }
   }
 
   &-decimal {
     &-xlarge {
       font-size: $price-decimal-xlarge-size;
-      line-height: $price-decimal-xlarge-size;
+      line-height: $price-minor-line-height;
     }
 
     &-large {
       font-size: $price-decimal-large-size;
-      line-height: $price-decimal-large-size;
+      line-height: $price-minor-line-height;
     }
 
     &-normal {
       font-size: $price-decimal-normal-size;
-      line-height: $price-decimal-normal-size;
+      line-height: $price-minor-line-height;
     }
 
     &-small {
       font-size: $price-decimal-small-size;
-      line-height: $price-decimal-small-size;
+      line-height: $price-minor-line-height;
     }
   }