element-plus-secondary 0.2.4 → 0.2.6

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

@@ -32,7 +32,7 @@
     );
 
     &:hover {
-      @include inset-input-border(#{getCssVar('input', 'hover-border-color')});
+      @include inset-input-border(#{getCssVar('input', 'focus-border-color')});
     }
   }
 

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

@@ -81,6 +81,16 @@
         cursor: not-allowed;
       }
     }
+
+    @include when(controls-right) {
+      @include e(increase) {
+        border-bottom: 1px solid !important;
+      }
+  
+      @include e(decrease) {
+        border-left: 1px solid !important;
+      }
+    }
   }
 
   .#{$namespace}-input-number__decrease:not(.is-disabled),
@@ -105,7 +115,20 @@
 
 
   @include m(dark) {
-    .#{$namespace}-input-number__decrease:not(.is-disabled),
+    .#{$namespace}-input-number__decrease,
+    .#{$namespace}-input-number__increase {
+      background: #292929;
+      color: #fff;
+      border-color: #5f5f5f;
+    }
+    &.is-controls-right {
+      .#{$namespace}-input-number__decrease,
+      .#{$namespace}-input-number__increase {
+        border-color: #5f5f5f !important;
+      }
+    }
+    &:not(.is-disabled) {
+      .#{$namespace}-input-number__decrease:not(.is-disabled),
       .#{$namespace}-input-number__increase:not(.is-disabled) {
         &:hover {
           color: getCssVar('color-primary');
@@ -134,27 +157,18 @@
           }
         }
       }
-    .#{$namespace}-input-number__decrease,
-    .#{$namespace}-input-number__increase {
-      background: #292929;
-      color: #fff;
-      border-color: #5f5f5f;
-    }
-    &.is-controls-right {
-      .#{$namespace}-input-number__decrease,
-      .#{$namespace}-input-number__increase {
-        border-color: #5f5f5f !important;
-      }
-      .#{$namespace}-input-number__decrease:not(.is-disabled) {
-        &::after {
-          border-left: 1px solid getCssVar('color-primary');
-          border-top: 1px solid getCssVar('color-primary');
+      &.is-controls-right {
+        .#{$namespace}-input-number__decrease:not(.is-disabled) {
+          &::after {
+            border-left: 1px solid getCssVar('color-primary');
+            border-top: 1px solid getCssVar('color-primary');
+          }
         }
-      }
-      .#{$namespace}-input-number__increase:not(.is-disabled) {
-        &::after {
-          border-left: 1px solid getCssVar('color-primary');
-          border-bottom: 1px solid getCssVar('color-primary');
+        .#{$namespace}-input-number__increase:not(.is-disabled) {
+          &::after {
+            border-left: 1px solid getCssVar('color-primary');
+            border-bottom: 1px solid getCssVar('color-primary');
+          }
         }
       }
     }
@@ -181,60 +195,61 @@
   }
 
   @include m(light) {
-    
-    &:not(.is-controls-right) {
-      .#{$namespace}-input-number__decrease:not(.is-disabled) {
-        &::after {
-          border-right: 1px solid getCssVar('color-primary');
-          left: 0;
+    &:not(.is-disabled) {
+      &:not(.is-controls-right) {
+        .#{$namespace}-input-number__decrease:not(.is-disabled) {
+          &::after {
+            border-right: 1px solid getCssVar('color-primary');
+            left: 0;
+          }
         }
-      }
-      .#{$namespace}-input-number__increase:not(.is-disabled) {
-        &::after {
-          border-left: 1px solid getCssVar('color-primary');
+        .#{$namespace}-input-number__increase:not(.is-disabled) {
+          &::after {
+            border-left: 1px solid getCssVar('color-primary');
+          }
         }
-      }
-
-      .#{$namespace}-input-number__decrease:not(.is-disabled),
-      .#{$namespace}-input-number__increase:not(.is-disabled) {
-        &:hover {
-          background-color: #fff;
-          & ~ .#{$namespace}-input:not(.is-disabled) .#{$namespace}-input__wrapper {
-            box-shadow: 0 0 0 1px
-              var(
-                #{getCssVarName('input', 'focus-border-color')},
-                map.get($input, 'focus-border-color')
-              )
-              inset !important;
+  
+        .#{$namespace}-input-number__decrease:not(.is-disabled),
+        .#{$namespace}-input-number__increase:not(.is-disabled) {
+          &:hover {
+            background-color: #fff;
+            & ~ .#{$namespace}-input:not(.is-disabled) .#{$namespace}-input__wrapper {
+              box-shadow: 0 0 0 1px
+                var(
+                  #{getCssVarName('input', 'focus-border-color')},
+                  map.get($input, 'focus-border-color')
+                )
+                inset !important;
+            }
           }
         }
       }
-    }
-    &.is-controls-right {
-      .#{$namespace}-input-number__decrease:not(.is-disabled) {
-        &::after {
-          border-left: 1px solid getCssVar('color-primary');
-          border-top: 1px solid getCssVar('color-primary');
+      &.is-controls-right {
+        .#{$namespace}-input-number__decrease:not(.is-disabled) {
+          &::after {
+            border-left: 1px solid getCssVar('color-primary');
+            border-top: 1px solid getCssVar('color-primary');
+          }
         }
-      }
-      .#{$namespace}-input-number__increase:not(.is-disabled) {
-        &::after {
-          border-left: 1px solid getCssVar('color-primary');
-          border-bottom: 1px solid getCssVar('color-primary');
+        .#{$namespace}-input-number__increase:not(.is-disabled) {
+          &::after {
+            border-left: 1px solid getCssVar('color-primary');
+            border-bottom: 1px solid getCssVar('color-primary');
+          }
         }
-      }
-      .#{$namespace}-input-number__decrease:not(.is-disabled),
-      .#{$namespace}-input-number__increase:not(.is-disabled) {
-        background-color: #fff;
-        &:hover {
-          background-color: #ebf1ff;
-          & ~ .#{$namespace}-input:not(.is-disabled) .#{$namespace}-input__wrapper {
-            box-shadow: 0 0 0 1px
-              var(
-                #{getCssVarName('input', 'focus-border-color')},
-                map.get($input, 'focus-border-color')
-              )
-              inset !important;
+        .#{$namespace}-input-number__decrease:not(.is-disabled),
+        .#{$namespace}-input-number__increase:not(.is-disabled) {
+          background-color: #fff;
+          &:hover {
+            background-color: #ebf1ff;
+            & ~ .#{$namespace}-input:not(.is-disabled) .#{$namespace}-input__wrapper {
+              box-shadow: 0 0 0 1px
+                var(
+                  #{getCssVarName('input', 'focus-border-color')},
+                  map.get($input, 'focus-border-color')
+                )
+                inset !important;
+            }
           }
         }
       }
@@ -297,7 +312,7 @@
       bottom: auto;
       left: auto;
       border-radius: 0 getCssVar('border-radius-base') 0 0;
-      border-bottom: getCssVar('border');
+      border-bottom: 1px solid #bbbfc4;
     }
 
     @include e(decrease) {
@@ -305,7 +320,7 @@
       top: auto;
       left: auto;
       border-right: none;
-      border-left: getCssVar('border');
+      border-left: 1px solid #bbbfc4;
       border-radius: 0 0 getCssVar('border-radius-base') 0;
     }
 

package/theme-chalk/src/input.scss

@@ -83,7 +83,7 @@
     
 
     &:hover {
-      @include inset-input-border(#{getCssVar('input', 'hover-border-color')});
+      @include inset-input-border(#{getCssVar('input', 'focus-border-color')});
     }
 
     &:focus {
@@ -192,7 +192,7 @@
     );
 
     &:hover {
-      @include inset-input-border(#{getCssVar('input', 'hover-border-color')});
+      @include inset-input-border(#{getCssVar('input', 'focus-border-color')});
     }
 
     @include when(focus) {
@@ -348,6 +348,17 @@
     .#{$namespace}-input__icon {
       cursor: not-allowed;
     }
+
+    &:not(.#{$namespace}-input--dark) {
+      .#{$namespace}-input-group__prepend {
+        @include inset-prepend-border(#{getCssVar('disabled-border-color')});
+      }
+    }
+
+
+    .#{$namespace}-select__prefix--light {
+      border-color: getCssVar('disabled-border-color');
+    }
   }
 
   @include m(dark) {
@@ -529,7 +540,7 @@
           .#{$namespace}-input__wrapper {
             z-index: 1;
             @include inset-prepend-input-border(
-              getCssVar('input-hover-border-color')
+              getCssVar('input-focus-border-color')
             );
           }
         }
@@ -572,7 +583,7 @@
           .#{$namespace}-input__wrapper {
             z-index: 1;
             @include inset-append-input-border(
-              getCssVar('input-hover-border-color')
+              getCssVar('input-focus-border-color')
             );
           }
         }

package/theme-chalk/src/message.scss

@@ -92,16 +92,19 @@
     position: absolute;
     top: 50%;
     right: 19px;
+    padding: 4px;
+    border-radius: 4px;
     transform: translateY(-50%);
     cursor: pointer;
-    color: getCssVar('message', 'close-icon-color');
+    color: #646A73;
     font-size: getCssVar('message', 'close-size');
 
     &:focus {
       outline-width: 0;
+      background: #e9e9ea;
     }
     &:hover {
-      color: getCssVar('message', 'close-hover-color');
+      background: #d2d3d4;
     }
   }
 }

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

@@ -38,6 +38,11 @@
     '#FEF1F1'
   );
 
+  @include set-css-var-value(
+    ('color', 'warning', 'light', 21),
+    '#FFE7CC'
+  );
+
 
 
   @include set-css-var-value(

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

@@ -48,7 +48,7 @@ $input-inline-start: map.get($input-padding-horizontal, 'default') !default;
 
     @include when(hovering) {
       &:not(.is-focused) {
-        border-color: getCssVar('border-color-hover');
+        border-color: getCssVar('color-primary');
       }
     }