From bb6303a839736e5519c23f9a468222e20945dfa3 Mon Sep 17 00:00:00 2001 From: James Yeung Date: Mon, 15 Jun 2020 00:29:33 +0800 Subject: [PATCH] chore: sync ant-design v4.3.4 (#223) --- components/comment/style/index.less | 2 +- components/comment/style/rtl.less | 4 ++-- components/divider/style/index.less | 9 ++++---- components/divider/style/rtl.less | 8 +++---- components/input/style/rtl.less | 33 ++++++---------------------- components/rate/style/index.less | 2 +- components/steps/style/nav.less | 2 +- components/style/themes/default.less | 5 +++++ components/tabs/style/dropdown.less | 2 +- 9 files changed, 26 insertions(+), 41 deletions(-) diff --git a/components/comment/style/index.less b/components/comment/style/index.less index 44afaa92d..73243c08a 100644 --- a/components/comment/style/index.less +++ b/components/comment/style/index.less @@ -79,7 +79,7 @@ display: inline-block; color: @comment-action-color; > span { - padding-right: 10px; + margin-right: 10px; color: @comment-action-color; font-size: @comment-font-size-sm; cursor: pointer; diff --git a/components/comment/style/rtl.less b/components/comment/style/rtl.less index 64abd941e..27ad52706 100644 --- a/components/comment/style/rtl.less +++ b/components/comment/style/rtl.less @@ -34,8 +34,8 @@ > li { > span { .@{comment-prefix-cls}-rtl & { - padding-right: 0; - padding-left: 10px; + margin-right: 0; + margin-left: 10px; } } } diff --git a/components/divider/style/index.less b/components/divider/style/index.less index 8c76b92eb..86b4056fc 100644 --- a/components/divider/style/index.less +++ b/components/divider/style/index.less @@ -2,7 +2,6 @@ @import '../../style/mixins/index'; @divider-prefix-cls: ~'@{ant-prefix}-divider'; -@divider-text-padding: 1em; .@{divider-prefix-cls} { .reset-component; @@ -51,22 +50,22 @@ &-horizontal&-with-text-left { &::before { top: 50%; - width: 5%; + width: @divider-orientation-margin; } &::after { top: 50%; - width: 95%; + width: 100% - @divider-orientation-margin; } } &-horizontal&-with-text-right { &::before { top: 50%; - width: 95%; + width: 100% - @divider-orientation-margin; } &::after { top: 50%; - width: 5%; + width: @divider-orientation-margin; } } diff --git a/components/divider/style/rtl.less b/components/divider/style/rtl.less index 12bc05710..3b3bcf9f0 100644 --- a/components/divider/style/rtl.less +++ b/components/divider/style/rtl.less @@ -11,12 +11,12 @@ &-horizontal&-with-text-left { &::before { .@{divider-prefix-cls}-rtl& { - width: 95%; + width: 100% - @divider-orientation-margin; } } &::after { .@{divider-prefix-cls}-rtl& { - width: 5%; + width: @divider-orientation-margin; } } } @@ -24,12 +24,12 @@ &-horizontal&-with-text-right { &::before { .@{divider-prefix-cls}-rtl& { - width: 5%; + width: @divider-orientation-margin; } } &::after { .@{divider-prefix-cls}-rtl& { - width: 95%; + width: 100% - @divider-orientation-margin; } } } diff --git a/components/input/style/rtl.less b/components/input/style/rtl.less index 015718821..a0e835524 100644 --- a/components/input/style/rtl.less +++ b/components/input/style/rtl.less @@ -80,9 +80,7 @@ .input-group(@inputClass) { > .@{inputClass}-rtl:first-child, &-rtl &-addon:first-child { - border-radius: @border-radius-base; - border-top-left-radius: 0; - border-bottom-left-radius: 0; + border-radius: 0 @border-radius-base @border-radius-base 0; } &-addon:first-child { @@ -102,28 +100,20 @@ > .@{inputClass}:last-child, &-addon:last-child { .@{inputClass}-group-rtl & { - border-radius: @border-radius-base; - border-top-right-radius: 0; - border-bottom-right-radius: 0; + border-radius: @border-radius-base 0 0 @border-radius-base; } } .@{inputClass}-affix-wrapper { &:not(:first-child) { .@{inputClass}-group-rtl& { - border-top-left-radius: @border-radius-base; - border-top-right-radius: 0; - border-bottom-right-radius: 0; - border-bottom-left-radius: @border-radius-base; + border-radius: @border-radius-base 0 0 @border-radius-base; } } &:not(:last-child) { .@{inputClass}-group-rtl& { - border-top-left-radius: 0; - border-top-right-radius: @border-radius-base; - border-bottom-right-radius: @border-radius-base; - border-bottom-left-radius: 0; + border-radius: 0 @border-radius-base @border-radius-base 0; } } } @@ -145,10 +135,7 @@ & > .@{ant-prefix}-mention-wrapper:first-child .@{ant-prefix}-mention-editor, & > .@{ant-prefix}-time-picker:first-child .@{ant-prefix}-time-picker-input { .@{inputClass}-group-rtl& { - border-top-left-radius: 0; - border-top-right-radius: @border-radius-base; - border-bottom-right-radius: @border-radius-base; - border-bottom-left-radius: 0; + border-radius: 0 @border-radius-base @border-radius-base 0; } } @@ -162,10 +149,7 @@ & > .@{ant-prefix}-time-picker:last-child .@{ant-prefix}-time-picker-input { .@{inputClass}-group-rtl& { border-left-width: @border-width-base; - border-top-left-radius: @border-radius-base; - border-top-right-radius: 0; - border-bottom-right-radius: 0; - border-bottom-left-radius: @border-radius-base; + border-radius: @border-radius-base 0 0 @border-radius-base; } } } @@ -243,10 +227,7 @@ .@{search-rtl-cls}& { .@{search-prefix}-button { width: 100%; - border-top-left-radius: @border-radius-base; - border-top-right-radius: 0; - border-bottom-right-radius: 0; - border-bottom-left-radius: @border-radius-base; + border-radius: @border-radius-base 0 0 @border-radius-base; } } } diff --git a/components/rate/style/index.less b/components/rate/style/index.less index c00f22e36..9480880ed 100644 --- a/components/rate/style/index.less +++ b/components/rate/style/index.less @@ -42,7 +42,7 @@ &:hover, &:focus { - transform: scale(1.1); + transform: @rate-star-hover-scale; } } diff --git a/components/steps/style/nav.less b/components/steps/style/nav.less index b4bc366a7..dd1ea6375 100644 --- a/components/steps/style/nav.less +++ b/components/steps/style/nav.less @@ -76,7 +76,7 @@ left: 50%; display: inline-block; width: 0; - height: 3px; + height: 2px; background-color: @steps-nav-active-color; transition: width 0.3s, left 0.3s; transition-timing-function: ease-out; diff --git a/components/style/themes/default.less b/components/style/themes/default.less index a4e17fc66..bfd2afc85 100644 --- a/components/style/themes/default.less +++ b/components/style/themes/default.less @@ -241,6 +241,10 @@ @descriptions-item-label-colon-margin-right: 8px; @descriptions-item-label-colon-margin-left: 2px; +// Divider +@divider-text-padding: 1em; +@divider-orientation-margin: 5%; + // Dropdown @dropdown-selected-color: @primary-color; @dropdown-menu-submenu-disabled-bg: @component-background; @@ -640,6 +644,7 @@ @rate-star-color: @yellow-6; @rate-star-bg: @border-color-split; @rate-star-size: 20px; +@rate-star-hover-scale: scale(1.1); // Card // --- diff --git a/components/tabs/style/dropdown.less b/components/tabs/style/dropdown.less index d9cbb8448..d9bcdf9e0 100644 --- a/components/tabs/style/dropdown.less +++ b/components/tabs/style/dropdown.less @@ -30,7 +30,7 @@ box-shadow: @box-shadow-base; &-item { - width: 120px; + min-width: 120px; margin: 0; padding: @dropdown-vertical-padding @control-padding-horizontal; overflow: hidden;