element-plus 2.1.0 → 2.1.3

package/theme-chalk/src/dropdown.scss

@@ -112,7 +112,7 @@ $dropdown-divider-width: 1px !default;
     }
 
     &.#{$namespace}-button::before {
-      background: var(--el-border-color-base);
+      background: getCssVar('border-color');
       opacity: 0.5;
     }
 
@@ -158,8 +158,7 @@ $dropdown-menu-padding-vertical: map.merge(
   top: 0;
   left: 0;
   z-index: var(--el-dropdown-menu-index);
-  padding: map.get($dropdown-menu-padding-vertical, 'default')-$border-width-base
-    0;
+  padding: map.get($dropdown-menu-padding-vertical, 'default')-$border-width 0;
   margin: 0;
   background-color: $color-white;
   border: none;
@@ -195,14 +194,13 @@ $dropdown-menu-padding-vertical: map.merge(
 
     @include when(disabled) {
       cursor: not-allowed;
-      color: var(--el-text-color-disabled-base);
+      color: var(--el-text-color-disabled);
     }
   }
 
   @each $size in (large, small) {
     @include m($size) {
-      padding: map.get($dropdown-menu-padding-vertical, $size)-$border-width-base
-        0;
+      padding: map.get($dropdown-menu-padding-vertical, $size)-$border-width 0;
 
       @include e(item) {
         padding: map.get($dropdown-item-padding, $size);

package/theme-chalk/src/image.scss

@@ -18,7 +18,7 @@
 
   @include e(placeholder) {
     @extend %size !optional;
-    background: var(--el-bg-color);
+    background: getCssVar('fill-color', 'light');
   }
 
   @include e(error) {
@@ -27,7 +27,7 @@
     justify-content: center;
     align-items: center;
     font-size: 14px;
-    background: var(--el-bg-color);
+    background: getCssVar('fill-color', 'light');
     color: var(--el-text-color-placeholder);
     vertical-align: middle;
   }

package/theme-chalk/src/input-number.scss

@@ -39,7 +39,7 @@
     bottom: 1px;
 
     width: map.get($input-height, 'default');
-    background: var(--el-bg-color);
+    background: getCssVar('fill-color', 'light');
     color: var(--el-text-color-regular);
     cursor: pointer;
     font-size: 13px;
@@ -67,13 +67,13 @@
   @include e(increase) {
     right: 1px;
     border-radius: 0 var(--el-border-radius-base) var(--el-border-radius-base) 0;
-    border-left: var(--el-border-base);
+    border-left: var(--el-border);
   }
 
   @include e(decrease) {
     left: 1px;
     border-radius: var(--el-border-radius-base) 0 0 var(--el-border-radius-base);
-    border-right: var(--el-border-base);
+    border-right: var(--el-border);
   }
 
   @include when(disabled) {
@@ -144,7 +144,7 @@
       bottom: auto;
       left: auto;
       border-radius: 0 var(--el-border-radius-base) 0 0;
-      border-bottom: var(--el-border-base);
+      border-bottom: var(--el-border);
     }
 
     @include e(decrease) {
@@ -152,7 +152,7 @@
       top: auto;
       left: auto;
       border-right: none;
-      border-left: var(--el-border-base);
+      border-left: var(--el-border);
       border-radius: 0 0 var(--el-border-radius-base) 0;
     }
 

package/theme-chalk/src/input.scss

@@ -81,7 +81,7 @@
 
   & .#{$namespace}-input__count {
     color: var(--el-color-info);
-    background: var(--el-color-white);
+    background: getCssVar('fill-color', 'blank');
     position: absolute;
     font-size: 12px;
     line-height: 14px;
@@ -143,7 +143,7 @@
     font-size: 12px;
 
     .#{$namespace}-input__count-inner {
-      background: $color-white;
+      background: getCssVar('fill-color', 'blank');
       line-height: initial;
       display: inline-block;
       padding: 0 5px;
@@ -166,7 +166,7 @@
     height: map.get($input-height, 'default');
     line-height: map.get($input-height, 'default');
     outline: none;
-    padding: 0 map.get($input-padding-horizontal, 'default')-$border-width-base;
+    padding: 0 map.get($input-padding-horizontal, 'default')-$border-width;
     transition: var(--el-transition-box-shadow);
     width: 100%;
     @include inset-input-border(
@@ -311,7 +311,7 @@
       @include e(inner) {
         height: map.get($input-height, $size);
         line-height: map.get($input-height, $size);
-        padding: 0 map.get($input-padding-horizontal, $size)-$border-width-base;
+        padding: 0 map.get($input-padding-horizontal, $size)-$border-width;
       }
 
       .#{$namespace}-input__icon {
@@ -361,7 +361,7 @@
   }
 
   @include e((append, prepend)) {
-    background-color: var(--el-bg-color);
+    background-color: getCssVar('fill-color', 'light');
     color: var(--el-color-info);
     vertical-align: middle;
     display: table-cell;

package/theme-chalk/src/message-box.scss

@@ -121,6 +121,11 @@
       padding-left: 1px;
     }
 
+    &.#{$namespace}-icon {
+      // 防止 el-icon 的position样式覆盖
+      position: absolute;
+    }
+
     + .#{$namespace}-message-box__message {
       padding-left: 36px;
       padding-right: 12px;

package/theme-chalk/src/mixins/_var.scss

@@ -4,6 +4,14 @@
 @use 'function' as *;
 @use '../common/var' as *;
 
+// set css var value, because we need translate value to string
+// for example:
+// @include set-css-var-value(('color', 'primary'), red);
+// --el-color-primary: red;
+@mixin set-css-var-value($name, $value) {
+  #{joinVarName($name)}: #{$value};
+}
+
 @mixin set-css-color-type-light($type, $i) {
   #{getCssVarName('color', $type, 'light', $i)}: #{map.get(
       $colors,
@@ -37,8 +45,12 @@
 
 @mixin set-css-color-rgb($type) {
   $color: map.get($colors, $type, 'base');
-  #{getCssVarName('color', $type, 'rgb')}: #{red($color)}, #{green($color)},
-    #{blue($color)};
+  @include set-css-var-value(
+    ('color', $type, 'rgb'),
+    #{red($color),
+    green($color),
+    blue($color)}
+  );
 }
 
 // generate css var from existing css var

package/theme-chalk/src/mixins/mixins.scss

@@ -1,7 +1,9 @@
 @use 'function' as *;
 @use '../common/var' as *;
+// forward mixins
 @forward 'config';
 @forward 'function';
+@forward '_var';
 @use 'config' as *;
 
 // Break-points

package/theme-chalk/src/page-header.scss

@@ -19,7 +19,7 @@
       right: -20px;
       top: 50%;
       transform: translateY(-50%);
-      background-color: var(--el-border-color-base);
+      background-color: getCssVar('border-color');
     }
 
     @include e(icon) {

package/theme-chalk/src/radio-button.scss

@@ -21,7 +21,7 @@
     white-space: nowrap;
     vertical-align: middle;
     background: var(--el-button-bg-color, map.get($button, 'bg-color'));
-    border: $border-base;
+    border: getCssVar('border');
     font-weight: var(--el-button-font-weight, map.get($button, 'font-weight'));
     border-left: 0;
     color: var(--el-button-text-color, map.get($button, 'text-color'));
@@ -57,7 +57,7 @@
 
   &:first-child {
     .#{$namespace}-radio-button__inner {
-      border-left: $border-base;
+      border-left: getCssVar('border');
       border-radius: var(--el-border-radius-base) 0 0
         var(--el-border-radius-base);
       box-shadow: none !important;

package/theme-chalk/src/radio.scss

@@ -41,11 +41,11 @@ $radio-font-size: map.merge(
   }
 
   @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;
+    padding: 0 map.get($checkbox-bordered-padding-right, 'default')-$border-width
+      0 map.get($checkbox-bordered-padding-left, 'default')-$border-width;
 
     border-radius: var(--el-border-radius-base);
-    border: var(--el-border-base);
+    border: var(--el-border);
     box-sizing: border-box;
 
     &.is-checked {
@@ -60,9 +60,9 @@ $radio-font-size: map.merge(
     @each $size in (large, small) {
       &.#{$namespace}-radio--#{$size} {
         padding: 0
-          map.get($checkbox-bordered-padding-right, $size)-$border-width-base
+          map.get($checkbox-bordered-padding-right, $size)-$border-width
           0
-          map.get($checkbox-bordered-padding-left, $size)-$border-width-base;
+          map.get($checkbox-bordered-padding-left, $size)-$border-width;
         border-radius: var(--el-border-radius-base);
 
         .#{$namespace}-radio__label {

package/theme-chalk/src/rate.scss

@@ -29,19 +29,21 @@ $rate-height: map.merge(
   }
 
   @include e(item) {
+    cursor: pointer;
     display: inline-block;
     position: relative;
     font-size: 0;
     vertical-align: middle;
+    color: var(--el-rate-void-color);
   }
 
-  & .#{$namespace}-rate__icon {
+  & .#{bem('rate', 'icon')} {
     position: relative;
     display: inline-block;
     font-size: var(--el-rate-icon-size);
     margin-right: var(--el-rate-icon-margin);
-    color: var(--el-rate-icon-color);
     transition: var(--el-transition-duration);
+
     &.hover {
       transform: scale(1.15);
     }
@@ -51,6 +53,10 @@ $rate-height: map.merge(
       left: 0;
       top: 0;
     }
+
+    @include when(active) {
+      color: getCssVar('rate', 'fill-color');
+    }
   }
 
   @include e(decimal) {
@@ -59,11 +65,13 @@ $rate-height: map.merge(
     left: 0;
     display: inline-block;
     overflow: hidden;
+    color: getCssVar('rate', 'fill-color');
   }
 
   @include e(text) {
     font-size: var(--el-rate-font-size);
     vertical-align: middle;
+    color: getCssVar('rate', 'text-color');
   }
 
   @each $size in (large, small) {
@@ -71,4 +79,11 @@ $rate-height: map.merge(
       height: map.get($rate-height, $size);
     }
   }
+
+  @include when(disabled) {
+    @include e(item) {
+      cursor: auto;
+      color: getCssVar('rate', 'disabled-void-color');
+    }
+  }
 }

package/theme-chalk/src/select-v2.scss

@@ -29,7 +29,7 @@ $input-inline-start: map.get($input-padding-horizontal, 'default') !default;
     box-sizing: border-box;
     cursor: pointer;
     padding: 1px 30px 1px 0;
-    border: 1px solid var(--el-border-color-base);
+    border: 1px solid getCssVar('border-color');
     border-radius: var(--el-border-radius-base);
     transition: border-color var(--el-transition-duration-fast)
       var(--el-ease-in-out-bezier-function);
@@ -54,7 +54,7 @@ $input-inline-start: map.get($input-padding-horizontal, 'default') !default;
     @include when(disabled) {
       cursor: not-allowed;
 
-      background-color: var(--el-bg-color);
+      background-color: getCssVar('fill-color', 'light');
       color: var(--el-text-color-placeholder);
       border-color: var(--el-select-disabled-border);
 

package/theme-chalk/src/slider.scss

@@ -42,11 +42,11 @@ $slider-height: map.merge(
       cursor: default;
 
       .#{$namespace}-slider__bar {
-        background-color: var(--el-slider-disable-color);
+        background-color: var(--el-slider-disabled-color);
       }
 
       .#{$namespace}-slider__button {
-        border-color: var(--el-slider-disable-color);
+        border-color: var(--el-slider-disabled-color);
       }
 
       .#{$namespace}-slider__button-wrapper {

package/theme-chalk/src/steps.scss

@@ -7,7 +7,7 @@
   @include m(simple) {
     padding: 13px 8%;
     border-radius: 4px;
-    background: var(--el-bg-color);
+    background: getCssVar('fill-color', 'light');
   }
 
   @include m(horizontal) {

package/theme-chalk/src/table.scss

@@ -122,7 +122,7 @@
 
     &.is-group {
       th.#{$namespace}-table__cell {
-        background: var(--el-bg-color);
+        background: getCssVar('fill-color', 'light');
       }
     }
   }

package/theme-chalk/src/tabs.scss

@@ -224,14 +224,14 @@
   }
   @include m(border-card) {
     background: $color-white;
-    border: 1px solid var(--el-border-color-base);
+    border: 1px solid getCssVar('border-color');
     box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.12), 0 0 6px 0 rgba(0, 0, 0, 0.04);
 
     > .#{$namespace}-tabs__content {
       padding: 15px;
     }
     > .#{$namespace}-tabs__header {
-      background-color: var(--el-bg-color);
+      background-color: getCssVar('fill-color', 'light');
       border-bottom: 1px solid var(--el-border-color-light);
       margin: 0;
     }
@@ -256,8 +256,8 @@
       &.is-active {
         color: var(--el-color-primary);
         background-color: $color-white;
-        border-right-color: var(--el-border-color-base);
-        border-left-color: var(--el-border-color-base);
+        border-right-color: getCssVar('border-color');
+        border-left-color: getCssVar('border-color');
       }
       &:not(.is-disabled):hover {
         color: var(--el-color-primary);
@@ -305,7 +305,7 @@
     &.#{$namespace}-tabs--border-card {
       .#{$namespace}-tabs__header.is-bottom {
         border-bottom: 0;
-        border-top: 1px solid var(--el-border-color-base);
+        border-top: 1px solid getCssVar('border-color');
       }
       .#{$namespace}-tabs__nav-wrap.is-bottom {
         margin-top: -1px;

package/theme-chalk/src/tag.scss

@@ -96,7 +96,7 @@ $tag-icon-span-gap: map.merge(
   align-items: center;
 
   height: map.get($tag-height, 'default');
-  padding: 0 map.get($tag-padding, 'default') - $border-width-base;
+  padding: 0 map.get($tag-padding, 'default') - $border-width;
   font-size: var(--el-tag-font-size);
   line-height: 1;
   border-width: $tag-border-width;
@@ -130,7 +130,7 @@ $tag-icon-span-gap: map.merge(
   }
 
   &.is-closable {
-    padding-right: map.get($tag-icon-span-gap, 'default') - $border-width-base;
+    padding-right: map.get($tag-icon-span-gap, 'default') - $border-width;
   }
 
   @each $size in (large, default, small) {
@@ -145,7 +145,7 @@ $tag-icon-span-gap: map.merge(
       }
 
       &.is-closable {
-        padding-right: map.get($tag-icon-span-gap, $size) - $border-width-base;
+        padding-right: map.get($tag-icon-span-gap, $size) - $border-width;
       }
     }
   }

package/theme-chalk/src/time-select.scss

@@ -1,4 +1,5 @@
 @use 'mixins/config' as *;
+@use 'mixins/mixins' as *;
 @use 'common/var' as *;
 @use './date-picker/picker.scss';
 @use './date-picker/date-picker.scss';
@@ -23,7 +24,7 @@
     }
 
     &:hover {
-      background-color: var(--el-bg-color);
+      background-color: getCssVar('fill-color', 'light');
       font-weight: bold;
       cursor: pointer;
     }

package/theme-chalk/src/upload.scss

@@ -28,7 +28,7 @@
 
   /* Picture Card for Wall */
   @include m(picture-card) {
-    #{getCssVarName('upload', 'picture-card', 'size')}: 148px;
+    @include set-css-var-value(('upload', 'picture-card', 'size'), 148px);
 
     background-color: #fbfdff;
     border: 1px dashed #c0ccda;
@@ -86,7 +86,7 @@
   }
 
   ~ .#{bem('upload', 'files')} {
-    border-top: $border-base;
+    border-top: getCssVar('border');
     margin-top: 7px;
     padding-top: 5px;
   }
@@ -177,7 +177,7 @@
     }
 
     &:hover {
-      background-color: var(--el-bg-color);
+      background-color: getCssVar('fill-color', 'light');
 
       .#{bem('icon', '', 'close')} {
         display: inline-flex;
@@ -288,11 +288,11 @@
 
   // upload-list
   @include m(picture-card) {
+    @include set-css-var-value(('upload-list', 'picture-card', 'size'), 148px);
+
     display: inline-flex;
     flex-wrap: wrap;
-
     margin: 0;
-    #{getCssVarName('upload-list', 'picture-card', 'size')}: 148px;
 
     .#{bem('upload-list', 'item')} {
       overflow: hidden;
@@ -349,7 +349,6 @@
       background: var(--el-color-success);
       text-align: center;
       transform: rotate(45deg);
-      box-shadow: 0 0 1pc 1px rgba(0, 0, 0, 0.2);
 
       i {
         font-size: 12px;

package/theme-chalk/src/var.scss

@@ -9,6 +9,8 @@
 // https://lisilinhart.info/posts/css-variables-performance/
 
 :root {
+  color-scheme: light;
+
   --el-color-white: #{$color-white};
   --el-color-black: #{$color-black};
 
@@ -30,45 +32,42 @@
     @include set-css-color-type($type);
   }
 
-  // Background
-  --el-bg-color: #{$bg-color};
-
-  // Border
-  --el-border-width-base: #{$border-width-base};
-  --el-border-style-base: #{$border-style-base};
-  --el-border-color-hover: #{$border-color-hover};
-  --el-border-base: var(--el-border-width-base) var(--el-border-style-base)
-    var(--el-border-color-base);
-
-  // Svg
-  --el-svg-monochrome-grey: #dcdde0;
-
-  // Fill
-  --el-fill-base: var(--el-color-white);
-
-  // Typography
-  @include set-component-css-var('font-size', $font-size);
-
-  --el-font-weight-primary: 500;
-  --el-font-line-height-primary: 24px;
-  --el-text-color-disabled-base: #bbb;
-
-  // z-index
-  --el-index-normal: 1;
-  --el-index-top: 1000;
-  --el-index-popper: 2000;
-
+  // color-scheme
+  // Background --el-bg-color-#{$type}
+  @include set-component-css-var('bg-color', $bg-color);
   // --el-text-color-#{$type}
   @include set-component-css-var('text-color', $text-color);
   // --el-border-color-#{$type}
   @include set-component-css-var('border-color', $border-color);
+  // Fill --el-fill-color-#{$type}
+  @include set-component-css-var('fill-color', $fill-color);
+
   // --el-border-radius-#{$type}
   @include set-component-css-var('border-radius', $border-radius);
+  // Typography
+  @include set-component-css-var('font-size', $font-size);
   // Box-shadow
   // --el-box-shadow-#{$type}
   @include set-component-css-var('box-shadow', $box-shadow);
   // Disable base
   @include set-component-css-var('disabled', $disabled);
+  // z-index --el-index-#{$type}
+  @include set-component-css-var('index', $z-index);
+
+  // Border
+  --el-border-width: #{$border-width};
+  --el-border-style: #{$border-style};
+  --el-border-color-hover: #{$border-color-hover};
+  --el-border: var(--el-border-width) var(--el-border-style)
+    var(--el-border-color);
+
+  // Svg
+  --el-svg-monochrome-grey: #dcdde0;
+
+  --el-font-weight-primary: 500;
+  --el-font-line-height-primary: 24px;
+
+  // z-index
 
   /* Transition
 -------------------------- */