@element-plus/nightly 0.0.20220403 → 0.0.20220404

package/theme-chalk/src/card.scss

@@ -7,31 +7,32 @@
 }
 
 @include b(card) {
-  border-radius: var(--el-card-border-radius);
-  border: 1px solid var(--el-card-border-color);
-  background-color: var(--el-card-bg-color);
+  border-radius: getCssVar('card', 'border-radius');
+  border: 1px solid getCssVar('card', 'border-color');
+  background-color: getCssVar('card', 'bg-color');
   overflow: hidden;
-  color: var(--el-text-color-primary);
-  transition: var(--el-transition-duration);
+  color: getCssVar('text-color', 'primary');
+  transition: getCssVar('transition-duration');
 
   @include when(always-shadow) {
-    box-shadow: var(--el-box-shadow-light);
+    box-shadow: getCssVar('box-shadow', 'light');
   }
 
   @include when(hover-shadow) {
     &:hover,
     &:focus {
-      box-shadow: var(--el-box-shadow-light);
+      box-shadow: getCssVar('box-shadow', 'light');
     }
   }
 
   @include e(header) {
-    padding: calc(var(--el-card-padding) - 2px) var(--el-card-padding);
-    border-bottom: 1px solid var(--el-card-border-color);
+    padding: calc(#{getCssVar('card', 'padding')} - 2px)
+      getCssVar('card', 'padding');
+    border-bottom: 1px solid getCssVar('card', 'border-color');
     box-sizing: border-box;
   }
 
   @include e(body) {
-    padding: var(--el-card-padding);
+    padding: getCssVar('card', 'padding');
   }
 }

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

@@ -49,31 +49,19 @@ $color-error: map.get($colors, 'error', 'base') !default;
 $color-info: map.get($colors, 'info', 'base') !default;
 
 // https://sass-lang.com/documentation/values/maps#immutability
-// mix color with white
-@mixin set-color-type-light($type, $number) {
+// mix colors with white/black to generate light/dark level
+@mixin set-color-mix-level(
+  $type,
+  $number,
+  $mode: 'light',
+  $mix-color: $color-white
+) {
   $colors: map.deep-merge(
     (
       $type: (
-        'light-#{$number}':
+        '#{$mode}-#{$number}':
           mix(
-            $color-white,
-            map.get($colors, $type, 'base'),
-            math.percentage(math.div($number, 10))
-          ),
-      ),
-    ),
-    $colors
-  ) !global;
-}
-
-// mix color with black
-@mixin set-color-type-dark($type, $number) {
-  $colors: map.deep-merge(
-    (
-      $type: (
-        'dark-#{$number}':
-          mix(
-            $color-black,
+            $mix-color,
             map.get($colors, $type, 'base'),
             math.percentage(math.div($number, 10))
           ),
@@ -94,14 +82,15 @@ $color-info: map.get($colors, 'info', 'base') !default;
 // 70% c6e2ff
 // 80% d9ecff
 // 90% ecf5ff
-@for $i from 1 through 9 {
-  @each $type in $types {
-    @include set-color-type-light($type, $i);
+@each $type in $types {
+  @for $i from 1 through 9 {
+    @include set-color-mix-level($type, $i, 'light', $color-white);
   }
 }
+
 // --el-color-primary-dark-2
 @each $type in $types {
-  @include set-color-type-dark($type, 2);
+  @include set-color-mix-level($type, 2, 'dark', $color-black);
 }
 
 $text-color: () !default;

package/theme-chalk/src/dark/css-vars.scss

@@ -2,12 +2,16 @@
 
 // CSS3 var
 @use './var' as *;
-@use '../mixins/var' as *;
+@use '../mixins/_var.scss' as *;
+@use '../mixins/mixins.scss' as *;
 
 html.dark {
   color-scheme: dark;
 
-  // todo dark.scss
+  // hex colors
+  @each $type in (primary, success, warning, danger, error, info) {
+    @include set-css-color-type($colors, $type);
+  }
 
   // color-scheme
   // Background --el-bg-color-#{$type}
@@ -19,3 +23,7 @@ html.dark {
   // Fill --el-fill-color-#{$type}
   @include set-component-css-var('fill-color', $fill-color);
 }
+
+@include dark(card) {
+  @include set-component-css-var('card', $card);
+}

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

@@ -1,6 +1,64 @@
 @use 'sass:map';
+@use 'sass:math';
+
+@use '../common/var.scss' as common;
+
+$colors: () !default;
+@each $type in common.$types {
+  $colors: map.deep-merge(
+    (
+      $type: (
+        'base': map.get(common.$colors, $type, 'base'),
+      ),
+    ),
+    $colors
+  ) !global;
+}
+
+// https://sass-lang.com/documentation/values/maps#immutability
+// mix colors with white/black to generate light/dark level
+@mixin set-color-mix-level(
+  $type,
+  $number,
+  $mode: 'light',
+  $mix-color: $color-white
+) {
+  // hex mix color
+  $colors: map.deep-merge(
+    (
+      $type: (
+        '#{$mode}-#{$number}':
+          mix(
+            $mix-color,
+            map.get($colors, $type, 'base'),
+            math.percentage(math.div($number, 10))
+          ),
+      ),
+    ),
+    $colors
+  ) !global;
+
+  // for designer to view transparent
+  // $colors: map.deep-merge(
+  //   (
+  //     $type: (
+  //       '#{$mode}-#{$number}':
+  //         rgba(map.get($colors, $type, 'base'), math.div(10 - $number, 10)),
+  //     ),
+  //   ),
+  //   $colors
+  // ) !global;
+}
 
 // dark-mode
+@each $type in common.$types {
+  @for $i from 1 through 9 {
+    @include set-color-mix-level($type, $i, 'light', common.$color-black);
+  }
+}
+@each $type in common.$types {
+  @include set-color-mix-level($type, 2, 'dark', common.$color-white);
+}
 
 // Background
 $bg-color: () !default;
@@ -57,3 +115,12 @@ $text-color: map.merge(
   ),
   $text-color
 );
+
+// card
+$card: () !default;
+$card: map.merge(
+  (
+    'bg-color': getCssVar('bg-color', 'overlay'),
+  ),
+  $card
+);

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

@@ -12,28 +12,26 @@
   #{joinVarName($name)}: #{$value};
 }
 
-@mixin set-css-color-type-light($type, $i) {
-  #{getCssVarName('color', $type, 'light', $i)}: #{map.get(
-      $colors,
-      $type,
-      'light-#{$i}'
-    )};
+// @include set-css-var-type('color', 'primary', $map);
+// --el-color-primary: #{map.get($map, 'primary')};
+@mixin set-css-var-type($name, $type, $variables) {
+  #{getCssVarName($name, $type)}: #{map.get($variables, $type)};
 }
 
-@mixin set-css-color-type($type) {
-  #{getCssVarName('color', $type)}: #{map.get($colors, $type, 'base')};
+@mixin set-css-color-type($colors, $type) {
+  @include set-css-var-value(('color', $type), map.get($colors, $type, 'base'));
+
   @each $i in (3, 5, 7, 8, 9) {
-    @include set-css-color-type-light($type, $i);
+    @include set-css-var-value(
+      ('color', $type, 'light', $i),
+      map.get($colors, $type, 'light-#{$i}')
+    );
   }
-  #{getCssVarName('color', $type, 'dark-2')}: #{map.get(
-      $colors,
-      $type,
-      'dark-2'
-    )};
-}
 
-@mixin set-css-var-type($name, $type, $variables) {
-  #{getCssVarName($name, $type)}: #{map.get($variables, $type)};
+  @include set-css-var-value(
+    ('color', $type, 'dark-2'),
+    map.get($colors, $type, 'dark-2')
+  );
 }
 
 // set all css var for component by map

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

@@ -219,7 +219,7 @@
 
 // dark
 @mixin dark($block) {
-  .dark {
+  html.dark {
     @include b($block) {
       @content;
     }

package/theme-chalk/src/var.scss

@@ -8,30 +8,49 @@
 // do not need that, since this could introduce recalculation overhead for rendering.
 // https://lisilinhart.info/posts/css-variables-performance/
 
+// common
 :root {
-  color-scheme: light;
-
   @include set-css-var-value('color-white', $color-white);
   @include set-css-var-value('color-black', $color-black);
-  @include set-css-var-value('color-primary', $color-primary);
 
   // get rgb
   @each $type in (primary, success, warning, danger, error, info) {
     @include set-css-color-rgb($type);
   }
 
-  @for $i from 1 through 9 {
-    @include set-css-color-type-light('primary', $i);
-  }
-  @include set-css-var-value(
-    ('color-primary', 'dark-2'),
-    map.get($colors, 'primary', 'dark-2')
-  );
+  // Typography
+  @include set-component-css-var('font-size', $font-size);
+  @include set-component-css-var('font-family', $font-family);
+
+  @include set-css-var-value('font-weight-primary', 500);
+  @include set-css-var-value('font-line-height-primary', 24px);
+
+  // z-index --el-index-#{$type}
+  @include set-component-css-var('index', $z-index);
+
+  // --el-border-radius-#{$type}
+  @include set-component-css-var('border-radius', $border-radius);
+
+  // Transition
+  // refer to this website to get the bezier motion function detail
+  // https://cubic-bezier.com/#p1,p2,p3,p4 (change px as your function parameter)
+  @include set-component-css-var('transition-duration', $transition-duration);
+
+  @include set-component-css-var('transition-function', $transition-function);
+  @include set-component-css-var('transition', $transition);
+}
+
+// for light
+:root {
+  color-scheme: light;
+
+  @include set-css-var-value('color-white', $color-white);
+  @include set-css-var-value('color-black', $color-black);
 
   // --el-color-#{$type}
   // --el-color-#{$type}-light-{$i}
-  @each $type in (success, warning, danger, error, info) {
-    @include set-css-color-type($type);
+  @each $type in (primary, success, warning, danger, error, info) {
+    @include set-css-color-type($colors, $type);
   }
 
   // color-scheme
@@ -44,18 +63,12 @@
   // 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);
-  @include set-component-css-var('font-family', $font-family);
   // 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);
+
   // overlay & mask
   @include set-component-css-var('overlay-color', $overlay-color);
   @include set-component-css-var('mask-color', $mask-color);
@@ -71,18 +84,4 @@
 
   // Svg
   @include css-var-from-global('svg-monochrome-grey', 'border-color');
-
-  @include set-css-var-value('font-weight-primary', 500);
-  @include set-css-var-value('font-line-height-primary', 24px);
-
-  // z-index
-
-  /* Transition
--------------------------- */
-  // refer to this website to get the bezier motion function detail
-  // https://cubic-bezier.com/#p1,p2,p3,p4 (change px as your function parameter)
-  @include set-component-css-var('transition-duration', $transition-duration);
-
-  @include set-component-css-var('transition-function', $transition-function);
-  @include set-component-css-var('transition', $transition);
 }