From a8d04b6237ce2b46792814b13b783b6b09cea2ed Mon Sep 17 00:00:00 2001 From: James Yeung Date: Sun, 20 Sep 2020 14:53:20 +0800 Subject: [PATCH] chore: sync ant-design v4.6.5 (#633) --- components/button/style/index.less | 2 +- components/date-picker/style/panel.less | 12 ++++++------ components/descriptions/style/index.less | 1 + components/layout/style/index.less | 15 +++++++++++++-- components/menu/style/index.less | 3 ++- components/space/style/index.less | 7 +++++++ components/style/themes/default.less | 2 ++ components/table/style/index.less | 2 +- 8 files changed, 33 insertions(+), 11 deletions(-) diff --git a/components/button/style/index.less b/components/button/style/index.less index db6918f6..cb419ff8 100644 --- a/components/button/style/index.less +++ b/components/button/style/index.less @@ -101,7 +101,7 @@ &-icon-only { .btn-square(@btn-prefix-cls); - vertical-align: -0.5px; + vertical-align: -1px; } &-round { diff --git a/components/date-picker/style/panel.less b/components/date-picker/style/panel.less index 9114996f..3a164e32 100644 --- a/components/date-picker/style/panel.less +++ b/components/date-picker/style/panel.less @@ -590,12 +590,12 @@ .@{picker-prefix-cls}-content { display: flex; flex: auto; - height: 224px; + height: @picker-time-panel-column-height; } &-column { flex: 1 0 auto; - width: 56px; + width: @picker-time-panel-column-width; margin: 0; padding: 0; overflow-y: hidden; @@ -605,10 +605,11 @@ &::after { display: block; - height: 224px - @picker-time-panel-cell-height; + height: @picker-time-panel-column-height - @picker-time-panel-cell-height; content: ''; .@{picker-prefix-cls}-datetime-panel & { - height: 224px - @picker-time-panel-cell-height + 2 * @border-width-base; + height: @picker-time-panel-column-height - @picker-time-panel-cell-height + 2 * + @border-width-base; } } @@ -634,10 +635,9 @@ width: 100%; height: @picker-time-panel-cell-height; margin: 0; - padding: 0; + padding: 0 0 0 ((@picker-time-panel-column-width - 28px) / 2); color: @text-color; line-height: @picker-time-panel-cell-height; - text-align: center; border-radius: 0; cursor: pointer; transition: background @animation-duration-slow; diff --git a/components/descriptions/style/index.less b/components/descriptions/style/index.less index dd974156..e2f26f67 100644 --- a/components/descriptions/style/index.less +++ b/components/descriptions/style/index.less @@ -86,6 +86,7 @@ color: @text-color; font-size: @font-size-base; line-height: @line-height-base; + overflow-wrap: break-word; } &-item { diff --git a/components/layout/style/index.less b/components/layout/style/index.less index 11acd3a4..016c789d 100644 --- a/components/layout/style/index.less +++ b/components/layout/style/index.less @@ -109,8 +109,19 @@ cursor: pointer; transition: background 0.3s ease; - &:hover { - background: tint(@layout-sider-background, 10%); + &::after { + position: absolute; + top: 0; + right: 0; + bottom: 0; + left: 0; + background: transparent; + transition: all 0.3s; + content: ''; + } + + &:hover::after { + background: rgba(255, 255, 255, 0.1); } &-right { diff --git a/components/menu/style/index.less b/components/menu/style/index.less index 0e47ff93..e29fd9d2 100644 --- a/components/menu/style/index.less +++ b/components/menu/style/index.less @@ -147,7 +147,8 @@ transform-origin: 0 0; // https://github.com/ant-design/ant-design/issues/22244 - &:not(.zoom-big-enter-active):not(.zoom-big-leave-active) { + // https://github.com/ant-design/ant-design/issues/26812 + &:not([class*='-active']) { overflow-x: hidden; overflow-y: auto; } diff --git a/components/space/style/index.less b/components/space/style/index.less index 44ae56a9..c73c6698 100644 --- a/components/space/style/index.less +++ b/components/space/style/index.less @@ -2,6 +2,7 @@ @import '../../style/mixins/index'; @space-prefix-cls: ~'@{ant-prefix}-space'; +@space-item-prefix-cls: ~'@{ant-prefix}-space-item'; .@{space-prefix-cls} { display: inline-flex; @@ -25,4 +26,10 @@ } } +.@{space-item-prefix-cls} { + &:empty { + display: none; + } +} + @import './rtl'; diff --git a/components/style/themes/default.less b/components/style/themes/default.less index e5f3e019..8dbe72ef 100644 --- a/components/style/themes/default.less +++ b/components/style/themes/default.less @@ -631,6 +631,8 @@ @picker-border-color: @border-color-split; @picker-date-hover-range-border-color: lighten(@primary-color, 20%); @picker-date-hover-range-color: @picker-basic-cell-hover-with-range-color; +@picker-time-panel-column-width: 56px; +@picker-time-panel-column-height: 224px; @picker-time-panel-cell-height: 28px; @picker-panel-cell-height: 24px; @picker-panel-cell-width: 36px; diff --git a/components/table/style/index.less b/components/table/style/index.less index 85ddc135..8ff5fcd7 100644 --- a/components/table/style/index.less +++ b/components/table/style/index.less @@ -9,7 +9,7 @@ @table-header-icon-color: #bfbfbf; @table-header-icon-color-hover: darken(@table-header-icon-color, 10%); @table-header-sort-active-filter-bg: lighten(@table-header-sort-active-bg, 2%); -@table-sticky-zindex: @zindex-table-fixed + 1; +@table-sticky-zindex: calc(@zindex-table-fixed + 1); @table-sticky-scroll-bar-active-bg: fade(@table-sticky-scroll-bar-bg, 80%); .@{table-prefix-cls}-wrapper {