Update Typescript definitions and font size (youzan#1057)

* fix: form props * fix: missing form props * fix: form definitions * fix: update font size
AzureTech · Apr 28, 2019 · e01cf98 · e01cf98
1 parent 1dc922f
commit e01cf98
Show file tree

Hide file tree

Showing 34 changed files with 113 additions and 105 deletions.
diff --git a/packages/zent/assets/alert.scss b/packages/zent/assets/alert.scss
@@ -1,4 +1,5 @@
 @import './theme/default';
+@import './theme/font';
 
 @mixin vertical-center {
   position: absolute;
@@ -19,7 +20,7 @@ $close-icon-size: 14px;
 .zent-alert {
   box-sizing: border-box;
   width: 100%;
-  font-size: 12px;
+  font-size: $font-size-normal;
   line-height: 12px;
   position: relative;
 

diff --git a/packages/zent/assets/avatar.scss b/packages/zent/assets/avatar.scss
@@ -1,4 +1,6 @@
 @import './theme/default';
+@import './theme/font';
+
 $avatar-size-small: 24px;
 $avatar-size-default: 32px;
 $avatar-size-large: 40px;
@@ -11,7 +13,7 @@ $avatar-size-large: 40px;
   cursor: default;
   overflow: hidden;
   position: relative;
-  font-size: 16px;
+  font-size: $font-size-large;
 
   &--size-default {
     width: $avatar-size-default;
@@ -49,7 +51,7 @@ $avatar-size-large: 40px;
     }
 
     &.zent-avatar--size-small {
-      font-size: 14px;
+      font-size: $font-size-normal;
     }
 
     &.zent-avatar--size-large {
@@ -62,7 +64,7 @@ $avatar-size-large: 40px;
     font-size: 18px;
 
     &.zent-avatar--size-small {
-      font-size: 14px;
+      font-size: $font-size-normal;
     }
 
     &.zent-avatar--size-large {

diff --git a/packages/zent/assets/block-header.scss b/packages/zent/assets/block-header.scss
@@ -1,4 +1,5 @@
 @import './theme/default';
+@import './theme/font';
 
 .zent-block-header {
   position: relative;
@@ -26,7 +27,7 @@
       margin: 0;
       padding-left: 5px;
       font-weight: normal;
-      font-size: 14px;
+      font-size: $font-size-normal;
     }
   }
 
@@ -42,7 +43,7 @@
   &__pop {
     display: inline-block;
     color: $theme-stroke-4;
-    font-size: 16px;
+    font-size: $font-size-large;
   }
 
   &__tooltip {
@@ -52,7 +53,7 @@
     &-trigger {
       color: $theme-stroke-5;
       margin-left: 10px;
-      font-size: 14px;
+      font-size: $font-size-normal;
       cursor: pointer;
     }
   }

diff --git a/packages/zent/assets/breadcrumb.scss b/packages/zent/assets/breadcrumb.scss
@@ -1,4 +1,5 @@
 @import './theme/default';
+@import './theme/font';
 
 .zent-breadcrumb {
   color: $theme-stroke-3;
@@ -8,7 +9,7 @@
 
   span,
   a {
-    font-size: 14px;
+    font-size: $font-size-normal;
     line-height: 1em;
     display: inline-block;
     vertical-align: middle;
@@ -53,7 +54,7 @@
       min-width: 0;
       border: 0;
       background: transparent;
-      font-size: 14px;
+      font-size: $font-size-normal;
       color: $theme-stroke-3;
       text-align: center;
       box-sizing: border-box;

diff --git a/packages/zent/assets/card.scss b/packages/zent/assets/card.scss
@@ -1,4 +1,5 @@
 @import './theme/default';
+@import './theme/font';
 
 .zent-card {
   background-color: $theme-stroke-9;
@@ -36,17 +37,17 @@
 
   &--normal {
     .zent-card-header {
-      font-size: 16px;
+      font-size: $font-size-large;
     }
 
     .zent-card-body {
-      font-size: 14px;
+      font-size: $font-size-normal;
     }
   }
 
   &--nested {
     .zent-card-header {
-      font-size: 14px;
+      font-size: $font-size-normal;
       background: $theme-stroke-8;
     }
   }

diff --git a/packages/zent/assets/cascader.scss b/packages/zent/assets/cascader.scss
@@ -1,4 +1,5 @@
 @import './theme/default';
+@import './theme/font';
 
 $c-border: $theme-stroke-4;
 $c-blue: $theme-primary-1;
@@ -45,7 +46,7 @@ $c-blue-hover: $theme-primary-6;
       white-space: nowrap;
       overflow: hidden;
       text-overflow: ellipsis;
-      font-size: 12px;
+      font-size: $font-size-normal;
 
       &-content {
         line-height: inherit;
@@ -61,7 +62,7 @@ $c-blue-hover: $theme-primary-6;
         right: 10px;
         top: 50%;
         transition: transform 0.25s;
-        font-size: 12px;
+        font-size: $font-size-normal;
         transform: scale(0.5);
       }
     }
@@ -79,7 +80,7 @@ $c-blue-hover: $theme-primary-6;
     overflow: auto;
 
     &-item {
-      font-size: 12px;
+      font-size: $font-size-normal;
       cursor: pointer;
       white-space: nowrap;
       transition: all 0.3s;
@@ -143,7 +144,7 @@ $c-blue-hover: $theme-primary-6;
     &-link {
       cursor: pointer;
       display: inline-block;
-      font-size: 12px;
+      font-size: $font-size-normal;
       padding: 0 5px;
       line-height: 18px;
       vertical-align: middle;

diff --git a/packages/zent/assets/colorpicker.scss b/packages/zent/assets/colorpicker.scss
@@ -1,4 +1,6 @@
 @import './theme/default';
+@import './theme/font';
+
 $c-border: $theme-stroke-5;
 $c-blue: $theme-primary-2;
 $c-light-blue: $theme-primary-4;
@@ -10,7 +12,6 @@ $c-light-blue: $theme-primary-4;
 .zent-color-picker {
   cursor: pointer;
   display: inline-block;
-  font-size: 12px;
   margin-right: 10px;
   outline: none;
   position: relative;

diff --git a/packages/zent/assets/date-range-quick-picker.scss b/packages/zent/assets/date-range-quick-picker.scss
@@ -1,4 +1,5 @@
 @import './theme/default';
+@import './theme/font';
 
 .zent-date-range-picker__filter {
   display: inline-block;
@@ -8,7 +9,7 @@
   margin-left: 10px;
   display: inline-block;
   padding: 2px 4px;
-  font-size: 12px;
+  font-size: $font-size-normal;
   color: $theme-stroke-4;
   cursor: pointer;
   box-sizing: border-box;

diff --git a/packages/zent/assets/error-boundary.scss b/packages/zent/assets/error-boundary.scss
@@ -1,9 +1,10 @@
 @import './theme/default';
+@import './theme/font';
 
 .zent-error-boundary-fallback-component {
   &__error {
     color: $theme-error-2;
-    font-size: 14px;
+    font-size: $font-size-normal;
 
     .zenticon-error-circle {
       margin-right: 5px;

diff --git a/packages/zent/assets/form.scss b/packages/zent/assets/form.scss
@@ -1,4 +1,5 @@
 @import './theme/default';
+@import './theme/font';
 
 .zent-form {
   margin-bottom: 30px;
@@ -22,7 +23,7 @@
   margin-bottom: 20px;
   width: 100%;
   border-bottom: 1px solid $theme-stroke-6;
-  font-size: 14px;
+  font-size: $font-size-normal;
   font-weight: bold;
 }
 
@@ -39,7 +40,7 @@
 
 .zent-form__static-value {
   padding-top: 5px;
-  font-size: 14px;
+  font-size: $font-size-normal;
   line-height: 18px;
   padding-bottom: 5px;
   word-break: break-all;
@@ -48,13 +49,13 @@
 .zent-form__control-action {
   padding-top: 5px;
   display: inline-block;
-  font-size: 14px;
+  font-size: $font-size-normal;
   line-height: 18px;
 }
 
 .zent-form__required {
   margin-right: 6px;
-  font-size: 16px;
+  font-size: $font-size-large;
   color: $theme-error-1;
   vertical-align: middle;
 }
@@ -64,13 +65,13 @@
 .zent-form__help-desc,
 .zent-form__notice-desc {
   line-height: 14px;
-  font-size: 12px;
+  font-size: $font-size-small;
   margin-top: 10px;
   margin-bottom: 0;
   color: $theme-stroke-3;
 
   ul li {
-    font-size: 12px;
+    font-size: $font-size-small;
     line-height: 12px;
   }
 
@@ -94,7 +95,7 @@
   .zent-form__control-label {
     display: inline-block;
     width: 120px;
-    font-size: 12px;
+    font-size: $font-size-normal;
     line-height: 30px;
     text-align: right;
     vertical-align: top;
@@ -139,7 +140,7 @@
 
     .zent-form__control-label {
       display: inline-block;
-      font-size: 12px;
+      font-size: $font-size-normal;
       vertical-align: top;
 
       & + .zent-form__controls {
@@ -153,7 +154,7 @@
 .zent-form--vertical {
   .zent-form__control-label {
     display: block;
-    font-size: 12px;
+    font-size: $font-size-normal;
     margin-bottom: 10px;
   }
 }
diff --git a/packages/zent/assets/grid.scss b/packages/zent/assets/grid.scss
@@ -1,10 +1,11 @@
 @import './theme/default';
+@import './theme/font';
 
 $thead-background-color: $theme-stroke-7;
 $border-color: $theme-stroke-6;
 
 .zent-grid {
-  font-size: 12px;
+  font-size: $font-size-normal;
   color: $theme-stroke-1;
   position: relative;
   line-height: 1.5;
@@ -236,7 +237,7 @@ $border-color: $theme-stroke-6;
 
   &-th,
   &-td {
-    font-size: 14px;
+    font-size: $font-size-normal;
     display: table-cell;
     box-sizing: border-box;
     box-shadow: inset 0 -1px 0 0 $theme-stroke-6;

diff --git a/packages/zent/assets/input.scss b/packages/zent/assets/input.scss
@@ -1,5 +1,6 @@
 @import './theme/default';
 @import './theme/font';
+
 $defaultBorderColor: $theme-stroke-5;
 $errorBorderColor: $theme-error-4;
 $borderRadius: 2px;
@@ -68,7 +69,7 @@ $large-size: 40px;
     color: $theme-stroke-5;
 
     &-close-circle {
-      font-size: 12px;
+      font-size: $font-size-small;
       right: 10px;
       cursor: pointer;
       padding: 4px 0;

diff --git a/packages/zent/assets/mixins/_popup.scss b/packages/zent/assets/mixins/_popup.scss
@@ -1,4 +1,5 @@
 @import '../theme/default';
+@import '../theme/font';
 
 @mixin popup {
   box-shadow: $shadow-spec-layer;
@@ -11,5 +12,5 @@
   background-color: $theme-stroke-9;
   max-height: 224px;
   border-radius: 3px;
-  font-size: 12px;
+  font-size: $font-size-normal;
 }
diff --git a/packages/zent/assets/notify.scss b/packages/zent/assets/notify.scss
@@ -1,4 +1,5 @@
 @import './theme/default';
+@import './theme/font';
 
 .zent-notify-container {
   z-index: 10000;
@@ -18,7 +19,7 @@
     line-height: 40px;
     max-height: 200px;
     overflow-y: auto;
-    font-size: 14px;
+    font-size: $font-size-normal;
     color: $theme-stroke-9;
     text-align: center;
     border-radius: 2px;

diff --git a/packages/zent/assets/pagination.scss b/packages/zent/assets/pagination.scss
@@ -3,6 +3,7 @@
 
 .zent-pagination {
   display: flex;
+  font-size: $font-size-normal;
 
   &-page-list--normal,
   &-page-list--mini,

diff --git a/packages/zent/assets/preview-image.scss b/packages/zent/assets/preview-image.scss
@@ -1,4 +1,5 @@
 @import './theme/default';
+@import './theme/font';
 
 $graycolor: $theme-stroke-3;
 $rgbamaskbgcolor: rgba(black, 0.6);
@@ -60,7 +61,7 @@ $rgbamaskbgcolor: rgba(black, 0.6);
   line-height: 40px;
   color: $theme-stroke-1;
   z-index: 2;
-  font-size: 16px;
+  font-size: $font-size-large;
 
   &.image-p-footer-paging {
     min-width: 216px;
@@ -79,7 +80,7 @@ $rgbamaskbgcolor: rgba(black, 0.6);
     cursor: pointer;
     padding: 0 30px;
     user-select: none;
-    font-size: 16px;
+    font-size: $font-size-large;
     min-width: 65px;
     text-align: center;