@element-plus/nightly 0.0.20221118 → 0.0.20221120

package/theme-chalk/src/cascader.scss

@@ -4,6 +4,37 @@
 @use 'mixins/var' as *;
 @use 'common/var' as *;
 
+@mixin cascader-tag-normal($background-color) {
+  .#{$namespace}-tag {
+    display: inline-flex;
+    align-items: center;
+    max-width: 100%;
+    margin: 2px 0 2px 6px;
+    text-overflow: ellipsis;
+    background: $background-color;
+
+    &:not(.is-hit) {
+      border-color: transparent;
+    }
+
+    > span {
+      flex: 1;
+      overflow: hidden;
+      text-overflow: ellipsis;
+    }
+
+    .#{$namespace}-icon-close {
+      flex: none;
+      background-color: getCssVar('text-color', 'placeholder');
+      color: getCssVar('color-white');
+
+      &:hover {
+        background-color: getCssVar('text-color', 'secondary');
+      }
+    }
+  }
+}
+
 @include b(cascader) {
   @include set-component-css-var('cascader', $cascader);
 
@@ -116,49 +147,13 @@
     line-height: normal;
     text-align: left;
     box-sizing: border-box;
-
-    .#{$namespace}-tag {
-      display: inline-flex;
-      align-items: center;
-      max-width: 100%;
-      margin: 2px 0 2px 6px;
-      text-overflow: ellipsis;
-      background: getCssVar('cascader-tag-background');
-
-      &:not(.is-hit) {
-        border-color: transparent;
-      }
-
-      > span {
-        flex: 1;
-        overflow: hidden;
-        text-overflow: ellipsis;
-      }
-
-      .#{$namespace}-icon-close {
-        flex: none;
-        background-color: getCssVar('text-color', 'placeholder');
-        color: getCssVar('color-white');
-
-        &:hover {
-          background-color: getCssVar('text-color', 'secondary');
-        }
-      }
-    }
+    @include cascader-tag-normal(getCssVar('cascader-tag-background'));
   }
 
   @include e(collapse-tags) {
     white-space: normal;
     z-index: getCssVar('index-normal');
-    display: flex;
-    align-items: center;
-    flex-wrap: wrap;
-  }
-
-  @include e(collapse-tag) {
-    line-height: inherit;
-    height: inherit;
-    display: flex;
+    @include cascader-tag-normal(getCssVar('fill-color'));
   }
 
   @include e(suggestion-panel) {

package/theme-chalk/src/pagination.scss

@@ -147,20 +147,6 @@
     }
   }
 
-  @include b(pager) {
-    user-select: none;
-    list-style: none;
-    font-size: 0;
-    padding: 0;
-    margin: 0;
-    display: flex;
-    align-items: center;
-
-    li {
-      @include pagination-button;
-    }
-  }
-
   @include e(rightwrapper) {
     flex: 1;
     display: flex;
@@ -217,3 +203,17 @@
     }
   }
 }
+
+@include b(pager) {
+  user-select: none;
+  list-style: none;
+  font-size: 0;
+  padding: 0;
+  margin: 0;
+  display: flex;
+  align-items: center;
+
+  li {
+    @include pagination-button;
+  }
+}