chore: sync ant-design v4.14.0

ant-design-blazor · Mar 15, 2021 · 237bc1e · 237bc1e
1 parent 1710a9e
commit 237bc1e
Show file tree

Hide file tree

Showing 14 changed files with 34 additions and 50 deletions.
diff --git a/components/carousel/style/index.less b/components/carousel/style/index.less
@@ -185,6 +185,7 @@
     }
     &-top {
       top: 12px;
+      bottom: auto;
     }
     li {
       position: relative;

diff --git a/components/form/style/index.less b/components/form/style/index.less
@@ -130,6 +130,7 @@
       // Optional mark
       .@{form-item-prefix-cls}-tooltip {
         color: @text-color-secondary;
+        cursor: help;
         writing-mode: horizontal-tb;
         margin-inline-start: @margin-xss;
       }

diff --git a/components/input/style/affix.less b/components/input/style/affix.less
@@ -8,7 +8,7 @@
     .input();
     display: inline-flex;
 
-    &:hover {
+    &:not(&-disabled):hover {
       .hover();
       z-index: 1;
       .@{ant-prefix}-input-search-with-button & {

diff --git a/components/modal/style/confirm.less b/components/modal/style/confirm.less
@@ -49,7 +49,7 @@
     float: right;
     margin-top: 24px;
 
-    button + button {
+    .@{ant-prefix}-btn + .@{ant-prefix}-btn {
       margin-bottom: 0;
       margin-left: 8px;
     }

diff --git a/components/modal/style/modal.less b/components/modal/style/modal.less
@@ -1,5 +1,4 @@
 @dialog-prefix-cls: ~'@{ant-prefix}-modal';
-@table-prefix-cls: ~'@{ant-prefix}-table';
 
 .@{dialog-prefix-cls} {
   .reset-component();
@@ -94,7 +93,7 @@
       @modal-footer-border-color-split;
     border-radius: 0 0 @border-radius-base @border-radius-base;
 
-    button + button {
+    .@{ant-prefix}-btn + .@{ant-prefix}-btn {
       margin-bottom: 0;
       margin-left: 8px;
     }

diff --git a/components/modal/style/rtl.less b/components/modal/style/rtl.less
@@ -23,7 +23,7 @@
     .@{dialog-wrap-rtl-cls} & {
       text-align: left;
     }
-    button + button {
+    .@{ant-prefix}-btn + .@{ant-prefix}-btn {
       .@{dialog-wrap-rtl-cls} & {
         margin-right: 8px;
         margin-left: 0;
@@ -54,7 +54,7 @@
       .@{dialog-wrap-rtl-cls} & {
         float: left;
       }
-      button + button {
+      .@{ant-prefix}-btn + .@{ant-prefix}-btn {
         .@{dialog-wrap-rtl-cls} & {
           margin-right: 8px;
           margin-left: 0;

diff --git a/components/select/style/multiple.less b/components/select/style/multiple.less
@@ -204,10 +204,9 @@
       .@{select-prefix-cls}-selection-placeholder {
         left: @input-padding-horizontal-sm;
       }
-      // https://github.com/ant-design/ant-design/issues/22906
-      .@{select-prefix-cls}-selection-search:first-child
-        .@{select-prefix-cls}-selection-search-input {
-        margin-left: 3px;
+      // https://github.com/ant-design/ant-design/issues/29559
+      .@{select-prefix-cls}-selection-search {
+        margin-inline-start: 3px;
       }
     }
     &.@{select-prefix-cls}-lg {

diff --git a/components/select/style/rtl.less b/components/select/style/rtl.less
@@ -86,13 +86,6 @@
         left: auto;
       }
     }
-
-    &:first-child > .@{select-prefix-cls}-selection-search-input {
-      .@{select-prefix-cls}-rtl& {
-        margin-right: 5px !important;
-        margin-left: 0 !important;
-      }
-    }
   }
 
   // ======================= Placeholder =======================
@@ -149,18 +142,6 @@
     }
   }
 
-  // ========================== Input ==========================
-  // We only change the style of non-customize input which is only support by `combobox` mode.
-
-  // Not customize
-  &:not(.@{select-prefix-cls}-customize-input) {
-    .@{select-prefix-cls}-selector {
-      .@{select-prefix-cls}-rtl& {
-        padding: 0 @input-padding-horizontal-base;
-      }
-    }
-  }
-
   // ============================================================
   // ==                          Size                          ==
   // ============================================================
@@ -171,7 +152,7 @@
       // With arrow should provides `padding-right` to show the arrow
       &.@{select-prefix-cls}-show-arrow .@{select-prefix-cls}-selection-search {
         .@{select-prefix-cls}-rtl& {
-          right: 0;
+          right: @input-padding-horizontal-sm - 1px;
         }
       }
 

diff --git a/components/style/themes/default.less b/components/style/themes/default.less
@@ -734,13 +734,14 @@
 @tabs-title-font-size-sm: @font-size-base;
 @tabs-ink-bar-color: @primary-color;
 @tabs-bar-margin: 0 0 @margin-md 0;
-@tabs-horizontal-margin: 0 32px 0 0;
+@tabs-horizontal-gutter: 32px;
+@tabs-horizontal-margin: 0 0 0 @tabs-horizontal-gutter;
 @tabs-horizontal-margin-rtl: 0 0 0 32px;
 @tabs-horizontal-padding: @padding-sm 0;
 @tabs-horizontal-padding-lg: @padding-md 0;
 @tabs-horizontal-padding-sm: @padding-xs 0;
 @tabs-vertical-padding: @padding-xs @padding-lg;
-@tabs-vertical-margin: 0 0 @margin-md 0;
+@tabs-vertical-margin: @margin-md 0 0 0;
 @tabs-scrolling-size: 32px;
 @tabs-highlight-color: @primary-color;
 @tabs-hover-color: @primary-5;

diff --git a/components/table/style/index.less b/components/table/style/index.less
@@ -497,8 +497,13 @@
     }
 
     // https://github.com/ant-design/ant-design/issues/25573
-    .@{descriptions-prefix-cls}-view table {
-      width: auto;
+    .@{descriptions-prefix-cls}-view {
+      display: flex;
+
+      table {
+        flex: auto;
+        width: auto;
+      }
     }
   }
 

diff --git a/components/tabs/style/card.less b/components/tabs/style/card.less
@@ -28,8 +28,8 @@
   &.@{tab-prefix-cls}-bottom {
     > .@{tab-prefix-cls}-nav,
     > div > .@{tab-prefix-cls}-nav {
-      .@{tab-prefix-cls}-tab:not(:last-of-type) {
-        margin-right: @tabs-card-gutter;
+      .@{tab-prefix-cls}-tab + .@{tab-prefix-cls}-tab {
+        margin-left: @tabs-card-gutter;
       }
     }
   }
@@ -64,8 +64,8 @@
   &.@{tab-prefix-cls}-right {
     > .@{tab-prefix-cls}-nav,
     > div > .@{tab-prefix-cls}-nav {
-      .@{tab-prefix-cls}-tab:not(:last-of-type) {
-        margin-bottom: @tabs-card-gutter;
+      .@{tab-prefix-cls}-tab + .@{tab-prefix-cls}-tab {
+        margin-top: @tabs-card-gutter;
       }
     }
   }

diff --git a/components/tabs/style/index.less b/components/tabs/style/index.less
@@ -127,19 +127,13 @@
     position: relative;
     display: inline-flex;
     align-items: center;
-    margin: @tabs-horizontal-margin;
     padding: @tabs-horizontal-padding;
     font-size: @tabs-title-font-size;
     background: transparent;
     border: 0;
     outline: none;
     cursor: pointer;
 
-    &:last-of-type {
-      margin-right: 0;
-      margin-left: 0;
-    }
-
     &-btn,
     &-remove {
       &:focus,
@@ -201,6 +195,10 @@
     }
   }
 
+  &-tab + &-tab {
+    margin: @tabs-horizontal-margin;
+  }
+
   // =========================== TabPanes ===========================
   &-content {
     &-holder {

diff --git a/components/tabs/style/position.less b/components/tabs/style/position.less
@@ -99,20 +99,19 @@
 
       // >>>>>>>>>>> Tab
       .@{tab-prefix-cls}-tab {
-        margin: @tabs-vertical-margin;
         padding: @tabs-vertical-padding;
         text-align: center;
 
-        &:last-of-type {
-          margin-bottom: 0;
-        }
-
         &-active .@{tab-prefix-cls}-tab-btn {
           font-weight: normal;
           text-shadow: 0 0 0.25px @tabs-active-color;
         }
       }
 
+      .@{tab-prefix-cls}-tab + .@{tab-prefix-cls}-tab {
+        margin: @tabs-vertical-margin;
+      }
+
       // >>>>>>>>>>> Nav
       .@{tab-prefix-cls}-nav-wrap {
         flex-direction: column;

diff --git a/components/tabs/style/rtl.less b/components/tabs/style/rtl.less
@@ -56,7 +56,7 @@
     &.@{tab-prefix-cls}-bottom {
       > .@{tab-prefix-cls}-nav,
       > div > .@{tab-prefix-cls}-nav {
-        .@{tab-prefix-cls}-tab:not(:last-of-type) {
+        .@{tab-prefix-cls}-tab + .@{tab-prefix-cls}-tab {
           .@{tab-prefix-cls}-rtl& {
             margin-right: 0;
             margin-left: @tabs-card-gutter;