chore: sync ant-design v4.10.3 (NG-ZORRO#6364)

Co-authored-by: ng-zorro-bot <ng-zorro-bot@users.noreply.github.com>
vthinkxie · Jan 22, 2021 · 7545b74 · 7545b74
1 parent 61ca6e2
commit 7545b74
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 17 deletions.
diff --git a/components/badge/style/index.less b/components/badge/style/index.less
@@ -47,6 +47,7 @@
   &-dot {
     z-index: @zindex-badge;
     width: @badge-dot-size;
+    min-width: @badge-dot-size;
     height: @badge-dot-size;
     background: @highlight-color;
     border-radius: 100%;

diff --git a/components/button/style/index.less b/components/button/style/index.less
@@ -117,10 +117,10 @@
 
   &::before {
     position: absolute;
-    top: -1px;
-    right: -1px;
-    bottom: -1px;
-    left: -1px;
+    top: -@btn-border-width;
+    right: -@btn-border-width;
+    bottom: -@btn-border-width;
+    left: -@btn-border-width;
     z-index: 1;
     display: none;
     background: @component-background;

diff --git a/components/empty/style/index.less b/components/empty/style/index.less
@@ -24,10 +24,6 @@
     }
   }
 
-  &-description {
-    margin: 0;
-  }
-
   &-footer {
     margin-top: 16px;
   }

diff --git a/components/style/themes/default.less b/components/style/themes/default.less
@@ -599,6 +599,7 @@
 @table-padding-horizontal-md: (@table-padding-horizontal / 2);
 @table-padding-vertical-sm: (@table-padding-vertical / 2);
 @table-padding-horizontal-sm: (@table-padding-horizontal / 2);
+@table-border-color: @border-color-split;
 @table-border-radius-base: @border-radius-base;
 @table-footer-bg: @background-color-light;
 @table-footer-color: @heading-color;

diff --git a/components/table/style/bordered.less b/components/table/style/bordered.less
@@ -1,7 +1,7 @@
 @import './index';
 @import './size';
 
-@table-border: @border-width-base @border-style-base @border-color-split;
+@table-border: @border-width-base @border-style-base @table-border-color;
 
 .@{table-prefix-cls}.@{table-prefix-cls}-bordered {
   // ============================ Title =============================
@@ -30,7 +30,7 @@
         // ============================ Header ============================
         > thead {
           > tr:not(:last-child) > th {
-            border-bottom: @border-width-base @border-style-base @border-color-split;
+            border-bottom: @border-width-base @border-style-base @table-border-color;
           }
         }
 

diff --git a/components/table/style/index.less b/components/table/style/index.less
@@ -83,7 +83,7 @@
         font-weight: 500;
         text-align: left;
         background: @table-header-bg;
-        border-bottom: @border-width-base @border-style-base @border-color-split;
+        border-bottom: @border-width-base @border-style-base @table-border-color;
         transition: background 0.3s ease;
 
         &[colspan]:not([colspan='1']) {
@@ -103,7 +103,7 @@
   &-tbody {
     > tr {
       > td {
-        border-bottom: @border-width-base @border-style-base @border-color-split;
+        border-bottom: @border-width-base @border-style-base @table-border-color;
         transition: background 0.3s;
 
         // ========================= Nest Table ===========================
@@ -150,7 +150,7 @@
     > tr {
       > th,
       > td {
-        border-bottom: @border-width-base @border-style-base @border-color-split;
+        border-bottom: @border-width-base @border-style-base @table-border-color;
       }
     }
   }
@@ -351,7 +351,7 @@
       padding: 7px 8px 7px 3px;
       overflow: hidden;
       background-color: @table-filter-btns-bg;
-      border-top: @border-width-base @border-style-base @border-color-split;
+      border-top: @border-width-base @border-style-base @table-border-color;
     }
   }
 
@@ -424,7 +424,7 @@
     line-height: ceil(((@font-size-sm * 1.4 - @border-width-base * 3) / 2)) * 2 + @border-width-base *
       3;
     background: @table-expand-icon-bg;
-    border: @border-width-base @border-style-base @border-color-split;
+    border: @border-width-base @border-style-base @table-border-color;
     border-radius: @border-radius-base;
     outline: none;
     transition: all 0.3s;
@@ -614,8 +614,8 @@
       z-index: @table-sticky-zindex;
       display: flex;
       align-items: center;
-      background: lighten(@border-color-split, 80%);
-      border-top: 1px solid @border-color-split;
+      background: lighten(@table-border-color, 80%);
+      border-top: 1px solid @table-border-color;
       opacity: 0.6;
       &:hover {
         transform-origin: center bottom;

diff --git a/components/tree/style/mixin.less b/components/tree/style/mixin.less
@@ -5,6 +5,7 @@
 @select-tree-prefix-cls: ~'@{ant-prefix}-select-tree';
 @tree-motion: ~'@{ant-prefix}-motion-collapse';
 @tree-node-padding: (@padding-xs / 2);
+@tree-node-hightlight-color: @volcano-7;
 
 .antTreeSwitcherIcon(@type: 'tree-default-open-icon') {
   .@{tree-prefix-cls}-switcher-icon,
@@ -90,6 +91,11 @@
     &-active .@{custom-tree-prefix-cls}-node-content-wrapper {
       background: @tree-node-hover-bg;
     }
+
+    &.filter-node .@{custom-tree-prefix-cls}-title {
+      color: @tree-node-hightlight-color;
+      font-weight: 500;
+    }
   }
 
   // >>> Indent