@element-plus/nightly 0.0.20220106 → 0.0.20220107

package/theme-chalk/src/checkbox.scss

@@ -19,6 +19,15 @@ $checkbox-bordered-input-height: map.merge(
   $checkbox-bordered-input-height
 );
 
+$checkbox-font-size: () !default;
+$checkbox-font-size: map.merge(
+  (
+    'large': 14px,
+    'small': 12px,
+  ),
+  $checkbox-font-size
+);
+
 $checkbox-bordered-input-width: () !default;
 $checkbox-bordered-input-width: map.merge(
   $checkbox-bordered-input-height,
@@ -42,12 +51,6 @@ $checkbox-bordered-input-width: map.merge(
   margin-right: 30px;
   height: map.get($checkbox-height, 'default');
 
-  @each $size in (large, small) {
-    &.#{$namespace}-checkbox--#{$size} {
-      height: map.get($checkbox-height, $size);
-    }
-  }
-
   @include when(bordered) {
     padding: 0 map.get($checkbox-bordered-padding-right, 'default')-$border-width-base
       0 map.get($checkbox-bordered-padding-left, 'default')-$border-width-base;
@@ -240,6 +243,37 @@ $checkbox-bordered-input-width: map.merge(
     font-size: var(--el-checkbox-font-size);
   }
 
+  @each $size in (large, small) {
+    &.#{$namespace}-checkbox--#{$size} {
+      height: map.get($checkbox-height, $size);
+      @include e(label) {
+        font-size: map.get($checkbox-font-size, $size);
+      }
+      @include e(inner) {
+        width: map.get($checkbox-font-size, $size);
+        height: map.get($checkbox-font-size, $size);
+      }
+    }
+  }
+
+  &.#{$namespace}-checkbox--small {
+    @include e(input) {
+      @include when(indeterminate) {
+        @include e(inner) {
+          &::before {
+            top: 4px;
+          }
+        }
+      }
+    }
+    @include e(inner) {
+      &::after {
+        width: 2px;
+        height: 6px;
+      }
+    }
+  }
+
   &:last-of-type {
     margin-right: 0;
   }

package/theme-chalk/src/common/var.scss

@@ -615,7 +615,6 @@ $switch: map.merge(
   (
     'on-color': var(--el-color-primary),
     'off-color': var(--el-border-color-base),
-    'font-size': var(--el-font-size-base),
     'core-border-radius': 10px,
     'width': 40px,
     'height': 20px,
@@ -905,7 +904,6 @@ $slider: map.merge(
     'runway-bg-color': var(--el-border-color-light),
     'stop-bg-color': var(--el-color-white),
     'disable-color': var(--el-text-color-placeholder),
-    'margin': 16px 0,
     'border-radius': 3px,
     'height': 6px,
     'button-size': 20px,

package/theme-chalk/src/date-picker/picker-panel.scss

@@ -29,7 +29,7 @@
 
   @include e(footer) {
     border-top: 1px solid var(--el-datepicker-inner-border-color);
-    padding: 4px;
+    padding: 4px 12px;
     text-align: right;
     background-color: $color-white;
     position: relative;

package/theme-chalk/src/radio.scss

@@ -6,6 +6,15 @@
 @use 'mixins/button' as *;
 @use 'common/var' as *;
 
+$radio-font-size: () !default;
+$radio-font-size: map.merge(
+  (
+    'large': 14px,
+    'small': 12px,
+  ),
+  $radio-font-size
+);
+
 @include b(radio) {
   @include set-component-css-var('radio', $radio);
 }
@@ -184,4 +193,16 @@
     font-size: var(--el-radio-font-size);
     padding-left: 8px;
   }
+
+  @each $size in (large, small) {
+    &.#{$namespace}-radio--#{$size} {
+      @include e(label) {
+        font-size: map.get($radio-font-size, $size);
+      }
+      @include e(inner) {
+        width: map.get($radio-font-size, $size);
+        height: map.get($radio-font-size, $size);
+      }
+    }
+  }
 }

package/theme-chalk/src/rate.scss

@@ -4,13 +4,24 @@
 @use 'mixins/var' as *;
 @use 'common/var' as *;
 
+$rate-height: () !default;
+$rate-height: map.merge(
+  (
+    'large': 40px,
+    'default': 32px,
+    'small': 24px,
+  ),
+  $rate-height
+);
+
 @include b(rate) {
   @include set-component-css-var('rate', $rate);
 }
 
 @include b(rate) {
-  height: var(--el-rate-height);
-  line-height: 1;
+  display: inline-flex;
+  align-items: center;
+  height: map.get($rate-height, 'default');
 
   &:focus,
   &:active {
@@ -54,4 +65,10 @@
     font-size: var(--el-rate-font-size);
     vertical-align: middle;
   }
+
+  @each $size in (large, small) {
+    @include m($size) {
+      height: map.get($rate-height, $size);
+    }
+  }
 }

package/theme-chalk/src/slider.scss

@@ -5,25 +5,36 @@
 @use 'mixins/var' as *;
 @use 'common/var' as *;
 
+$slider-height: () !default;
+$slider-height: map.merge(
+  (
+    'large': 40px,
+    'default': 32px,
+    'small': 24px,
+  ),
+  $slider-height
+);
+
 @include b(slider) {
   @include set-component-css-var('slider', $slider);
 }
 
 @include b(slider) {
-  @include utils-clearfix;
+  width: 100%;
+  height: map.get($slider-height, 'default');
+  display: flex;
+  align-items: center;
 
   @include e(runway) {
-    width: 100%;
+    flex: 1;
     height: var(--el-slider-height);
-    margin: var(--el-slider-margin);
     background-color: var(--el-slider-runway-bg-color);
     border-radius: var(--el-slider-border-radius);
     position: relative;
     cursor: pointer;
-    vertical-align: middle;
 
     &.show-input {
-      margin-right: 160px;
+      margin-right: 30px;
       width: auto;
     }
 
@@ -69,17 +80,8 @@
   }
 
   @include e(input) {
-    float: right;
-    margin-top: 3px;
+    flex-shrink: 0;
     width: 130px;
-
-    &.#{$namespace}-input-number--large {
-      margin-top: -2px;
-    }
-
-    &.#{$namespace}-input-number--small {
-      margin-top: 5px;
-    }
   }
 
   @include e(bar) {
@@ -168,6 +170,9 @@
 
   @include when(vertical) {
     position: relative;
+    height: 100%;
+    flex: 0;
+
     .#{$namespace}-slider__runway {
       width: var(--el-slider-height);
       height: 100%;
@@ -186,68 +191,6 @@
     .#{$namespace}-slider__stop {
       transform: translateY(50%);
     }
-    &.#{$namespace}-slider--with-input {
-      padding-bottom: #{map.get($input-height, 'default') + 22px};
-      .#{$namespace}-slider__input {
-        overflow: visible;
-        float: none;
-        position: absolute;
-        bottom: 22px;
-        width: 36px;
-        margin-top: 15px;
-        .#{$namespace}-input__inner {
-          text-align: center;
-          padding-left: 5px;
-          padding-right: 5px;
-        }
-        .#{$namespace}-input-number__decrease,
-        .#{$namespace}-input-number__increase {
-          top: map.get($input-height, 'small');
-          margin-top: -1px;
-          border: var(--el-input-border, map.get($input, 'border'));
-          line-height: 20px;
-          box-sizing: border-box;
-          transition: var(--el-transition-border);
-        }
-        .#{$namespace}-input-number__decrease {
-          width: 18px;
-          right: 18px;
-          border-bottom-left-radius: var(
-            --el-input-border-radius,
-            map.get($input, 'border-radius')
-          );
-        }
-        .#{$namespace}-input-number__increase {
-          width: 19px;
-          border-bottom-right-radius: var(
-            --el-input-border-radius,
-            map.get($input, 'border-radius')
-          );
-          & ~ .#{$namespace}-input .#{$namespace}-input__inner {
-            border-bottom-left-radius: 0;
-            border-bottom-right-radius: 0;
-          }
-        }
-        &:hover {
-          .#{$namespace}-input-number__decrease,
-          .#{$namespace}-input-number__increase {
-            border-color: var(
-              --el-input-hover-border,
-              map.get($input, 'hover-border')
-            );
-          }
-        }
-        &:active {
-          .#{$namespace}-input-number__decrease,
-          .#{$namespace}-input-number__increase {
-            border-color: var(
-              --el-input-focus-border,
-              map.get($input, 'focus-border')
-            );
-          }
-        }
-      }
-    }
 
     @include e(marks-text) {
       margin-top: 0;
@@ -255,4 +198,12 @@
       transform: translateY(50%);
     }
   }
+
+  @each $size in (large, small) {
+    @include m($size) {
+      height: map.get($slider-height, $size);
+      @include e(runway) {
+      }
+    }
+  }
 }

package/theme-chalk/src/switch.scss

@@ -4,6 +4,26 @@
 @use 'mixins/var' as *;
 @use 'common/var' as *;
 
+$switch-height: () !default;
+$switch-height: map.merge(
+  (
+    'large': 40px,
+    'default': 32px,
+    'small': 24px,
+  ),
+  $switch-height
+);
+
+$switch-font-size: () !default;
+$switch-font-size: map.merge(
+  (
+    'large': 14px,
+    'default': 14px,
+    'small': 12px,
+  ),
+  $switch-font-size
+);
+
 @include b(switch) {
   @include set-component-css-var('switch', $switch);
 }
@@ -12,9 +32,9 @@
   display: inline-flex;
   align-items: center;
   position: relative;
-  font-size: var(--el-switch-font-size);
+  font-size: map.get($switch-font-size, 'default');
   line-height: var(--el-switch-height);
-  height: var(--el-switch-height);
+  height: map.get($switch-height, 'default');
   vertical-align: middle;
   @include when(disabled) {
     & .#{$namespace}-switch__core,
@@ -27,7 +47,7 @@
     transition: var(--el-transition-duration-fast);
     height: var(--el-switch-height);
     display: inline-block;
-    font-size: var(--el-switch-font-size);
+    font-size: map.get($switch-font-size, 'default');
     font-weight: 500;
     cursor: pointer;
     vertical-align: middle;
@@ -45,11 +65,12 @@
     }
     & * {
       line-height: 1;
-      font-size: var(--el-switch-font-size);
+      font-size: map.get($switch-font-size, 'default');
       display: inline-block;
     }
     .#{$namespace}-icon {
       height: inherit;
+
       svg {
         vertical-align: middle;
       }
@@ -140,11 +161,13 @@
     .#{$namespace}-switch__core {
       border-color: var(--el-switch-on-color);
       background-color: var(--el-switch-on-color);
+
       .#{$namespace}-switch__action {
         left: 100%;
         margin-left: calc(-1px - var(--el-switch-button-size));
         color: var(--el-switch-on-color);
       }
+
       .#{$namespace}-switch__inner {
         left: 50%;
         margin-left: calc(-1px - var(--el-switch-button-size));
@@ -163,6 +186,7 @@
           left: 10px;
         }
       }
+
       &.#{$namespace}-switch__label--right {
         span {
           right: 10px;
@@ -175,4 +199,19 @@
   & .label-fade-leave-active {
     opacity: 0;
   }
+
+  @each $size in (large, small) {
+    @include m($size) {
+      font-size: map.get($switch-font-size, $size);
+      height: map.get($switch-height, $size);
+
+      @include e(label) {
+        font-size: map.get($switch-font-size, $size);
+
+        & * {
+          font-size: map.get($switch-font-size, $size);
+        }
+      }
+    }
+  }
 }