Browse Source

feat(button): 细化两个变量 (#1389)

Amumu 3 years ago
parent
commit
15040713c1

+ 2 - 1
src/packages/__VUE/button/index.scss

@@ -124,6 +124,7 @@
     width: 100%;
     height: $button-large-height;
     line-height: $button-large-line-height;
+    font-size: $button-large-font-size;
   }
 
   &--normal {
@@ -139,7 +140,7 @@
   }
   &--mini {
     height: $button-mini-height;
-    line-height: 1.2;
+    line-height: $button-mini-line-height;
     padding: $button-mini-padding;
     font-size: $button-mini-font-size;
   }

+ 2 - 0
src/packages/styles/variables-jdb.scss

@@ -125,8 +125,10 @@ $button-block-height: 48px !default;
 $button-default-line-height: 36px !default;
 $button-block-line-height: 46px !default;
 $button-default-font-size: $font-size-2 !default;
+$button-large-font-size: $button-default-font-size !default;
 $button-small-font-size: $font-size-1 !default;
 $button-mini-font-size: $font-size-1 !default;
+$button-mini-line-height: 1.2 !default;
 $button-disabled-opacity: $primary-disabled-opacity !default;
 $button-primary-color: $tdd-color-white !default;
 $button-primary-border-color: $tdd-color-brand-normal !default;

+ 2 - 0
src/packages/styles/variables-jdt.scss

@@ -55,8 +55,10 @@ $button-block-height: 48px !default;
 $button-default-line-height: 36px !default;
 $button-block-line-height: 46px !default;
 $button-default-font-size: $font-size-3 !default;
+$button-large-font-size: $button-default-font-size !default;
 $button-small-font-size: $font-size-2 !default;
 $button-mini-font-size: $font-size-1 !default;
+$button-mini-line-height: 1.2 !default;
 $button-disabled-opacity: 0.68 !default;
 $button-primary-color: $white !default;
 $button-primary-border-color: $primary-color !default;

+ 2 - 0
src/packages/styles/variables.scss

@@ -56,8 +56,10 @@ $button-block-height: 48px !default;
 $button-default-line-height: 36px !default;
 $button-block-line-height: 46px !default;
 $button-default-font-size: $font-size-2 !default;
+$button-large-font-size: $button-default-font-size !default;
 $button-small-font-size: $font-size-1 !default;
 $button-mini-font-size: $font-size-1 !default;
+$button-mini-line-height: 1.2 !default;
 $button-disabled-opacity: 0.68 !default;
 $button-primary-color: $white !default;
 $button-primary-border-color: $primary-color !default;