From f170acfb14011305e20c306c7bc15d88672dc3b8 Mon Sep 17 00:00:00 2001 From: ng-zorro-bot Date: Sun, 26 May 2019 07:27:21 +0000 Subject: [PATCH] chore: sync ant-design v3.19.0 --- components/affix/style/index.less | 2 +- components/alert/style/index.less | 3 +- components/anchor/style/index.less | 3 +- components/auto-complete/style/index.less | 11 +- components/avatar/style/index.less | 3 +- components/back-top/style/index.less | 3 +- components/badge/style/index.less | 3 +- components/breadcrumb/style/index.less | 9 +- components/button/style/index.less | 21 +- components/button/style/mixin.less | 37 ++- components/calendar/style/index.less | 5 +- components/card/style/index.less | 3 +- components/carousel/style/index.less | 16 +- components/cascader/style/index.less | 16 +- components/checkbox/style/index.less | 2 +- components/checkbox/style/mixin.less | 5 + components/collapse/style/index.less | 20 +- components/comment/style/index.less | 2 +- components/date-picker/style/Calendar.less | 1 + components/date-picker/style/Picker.less | 2 + components/date-picker/style/RangePicker.less | 1 + components/date-picker/style/index.less | 2 +- components/divider/style/index.less | 3 +- components/drawer/style/drawer.less | 20 +- components/drawer/style/index.less | 2 +- components/dropdown/style/index.less | 3 +- components/empty/style/index.less | 2 +- components/form/style/index.less | 15 +- components/form/style/mixin.less | 1 + components/grid/style/index.less | 3 +- components/icon/style/index.less | 2 +- components/input-number/style/index.less | 5 +- components/input/style/index.less | 2 +- components/input/style/mixin.less | 2 +- components/input/style/search-input.less | 2 +- components/layout/style/index.less | 2 +- components/list/style/index.less | 29 +- components/mention/style/index.less | 5 +- components/menu/style/index.less | 8 +- components/message/style/index.less | 3 +- components/modal/style/index.less | 2 +- components/modal/style/modal.less | 2 + components/notification/style/index.less | 11 +- components/page-header/style/index.less | 13 +- components/pagination/style/index.less | 58 +++- components/popover/style/index.less | 5 +- components/progress/style/index.less | 3 +- components/radio/style/index.less | 12 +- components/rate/style/index.less | 3 +- components/select/style/index.less | 31 +- components/skeleton/style/index.less | 2 +- components/slider/style/index.less | 4 +- components/spin/style/index.less | 9 +- components/statistic/style/index.less | 4 +- components/steps/style/index.less | 41 ++- components/style/color/colorPalette.less | 2 +- components/style/core/base.less | 2 +- components/style/core/iconfont.less | 2 +- components/style/core/motion.less | 7 +- components/style/core/motion/other.less | 24 +- components/style/core/motion/swing.less | 1 + components/style/index.less | 2 +- components/style/mixins/clearfix.less | 2 +- components/style/mixins/iconfont.less | 1 + components/style/mixins/index.less | 1 + components/style/mixins/motion.less | 4 +- components/style/mixins/operation-unit.less | 18 ++ components/style/mixins/reset.less | 2 +- components/style/themes/default.less | 13 +- components/style/themes/index.less | 1 + components/switch/style/index.less | 7 +- components/table/style/index.less | 295 +++++++++--------- components/table/style/size.less | 8 +- components/tabs/style/card-style.less | 3 +- components/tabs/style/index.less | 26 +- components/tag/style/index.less | 6 +- components/time-picker/style/index.less | 4 +- components/timeline/style/index.less | 3 +- components/tooltip/style/index.less | 5 +- components/transfer/style/customize.less | 62 ++++ components/transfer/style/index.less | 26 +- components/tree-select/style/index.less | 3 +- components/tree/style/directory.less | 2 +- components/tree/style/index.less | 26 +- components/tree/style/mixin.less | 1 + components/upload/style/index.less | 9 +- 86 files changed, 734 insertions(+), 313 deletions(-) create mode 100644 components/style/mixins/operation-unit.less create mode 100644 components/style/themes/index.less create mode 100644 components/transfer/style/customize.less diff --git a/components/affix/style/index.less b/components/affix/style/index.less index 9f19860e552..3762903fccb 100644 --- a/components/affix/style/index.less +++ b/components/affix/style/index.less @@ -1,4 +1,4 @@ -@import '../../style/themes/default'; +@import '../../style/themes/index'; .@{ant-prefix}-affix { position: fixed; diff --git a/components/alert/style/index.less b/components/alert/style/index.less index fcb57381ca1..31deb23d932 100644 --- a/components/alert/style/index.less +++ b/components/alert/style/index.less @@ -1,4 +1,4 @@ -@import '../../style/themes/default'; +@import '../../style/themes/index'; @import '../../style/mixins/index'; @alert-prefix-cls: ~'@{ant-prefix}-alert'; @@ -10,6 +10,7 @@ .@{alert-prefix-cls} { .reset-component; + position: relative; padding: 8px 15px 8px 37px; border-radius: @border-radius-base; diff --git a/components/anchor/style/index.less b/components/anchor/style/index.less index c4b724d1378..ce82041718c 100644 --- a/components/anchor/style/index.less +++ b/components/anchor/style/index.less @@ -1,10 +1,11 @@ -@import '../../style/themes/default'; +@import '../../style/themes/index'; @import '../../style/mixins/index'; @anchor-border-width: 2px; .@{ant-prefix}-anchor { .reset-component; + position: relative; padding-left: @anchor-border-width; diff --git a/components/auto-complete/style/index.less b/components/auto-complete/style/index.less index b7713e34108..6187de2c742 100644 --- a/components/auto-complete/style/index.less +++ b/components/auto-complete/style/index.less @@ -1,4 +1,4 @@ -@import '../../style/themes/default'; +@import '../../style/themes/index'; @import '../../style/mixins/index'; @import '../../input/style/mixin'; @@ -54,6 +54,7 @@ } &[disabled] { .disabled; + background-color: transparent; } } @@ -81,3 +82,11 @@ } } } + +// https://github.com/ant-design/ant-design/issues/14156 +.@{input-prefix-cls}-group > .@{autocomplete-prefix-cls} { + .@{select-prefix-cls}-search__field.@{input-prefix-cls}-affix-wrapper { + display: inline; + float: none; + } +} diff --git a/components/avatar/style/index.less b/components/avatar/style/index.less index e1ec77ad66a..f2c22c03765 100644 --- a/components/avatar/style/index.less +++ b/components/avatar/style/index.less @@ -1,10 +1,11 @@ -@import '../../style/themes/default'; +@import '../../style/themes/index'; @import '../../style/mixins/index'; @avatar-prefix-cls: ~'@{ant-prefix}-avatar'; .@{avatar-prefix-cls} { .reset-component; + position: relative; display: inline-block; overflow: hidden; diff --git a/components/back-top/style/index.less b/components/back-top/style/index.less index e4280723eab..7318a749769 100644 --- a/components/back-top/style/index.less +++ b/components/back-top/style/index.less @@ -1,10 +1,11 @@ -@import '../../style/themes/default'; +@import '../../style/themes/index'; @import '../../style/mixins/index'; @backtop-prefix-cls: ~'@{ant-prefix}-back-top'; .@{backtop-prefix-cls} { .reset-component; + position: fixed; right: 100px; bottom: 50px; diff --git a/components/badge/style/index.less b/components/badge/style/index.less index d9ed1bda1db..d638e0a15b1 100644 --- a/components/badge/style/index.less +++ b/components/badge/style/index.less @@ -1,4 +1,4 @@ -@import '../../style/themes/default'; +@import '../../style/themes/index'; @import '../../style/mixins/index'; @badge-prefix-cls: ~'@{ant-prefix}-badge'; @@ -6,6 +6,7 @@ .@{badge-prefix-cls} { .reset-component; + position: relative; display: inline-block; color: unset; diff --git a/components/breadcrumb/style/index.less b/components/breadcrumb/style/index.less index 30caa834441..606103584b9 100644 --- a/components/breadcrumb/style/index.less +++ b/components/breadcrumb/style/index.less @@ -1,10 +1,11 @@ -@import '../../style/themes/default'; +@import '../../style/themes/index'; @import '../../style/mixins/index'; @breadcrumb-prefix-cls: ~'@{ant-prefix}-breadcrumb'; .@{breadcrumb-prefix-cls} { .reset-component; + color: @breadcrumb-base-color; font-size: @breadcrumb-font-size; @@ -38,4 +39,10 @@ margin-left: 4px; } } + + &-overlay-link { + > .@{iconfont-css-prefix} { + margin-left: 4px; + } + } } diff --git a/components/button/style/index.less b/components/button/style/index.less index ef371977504..74ca43b9ec7 100644 --- a/components/button/style/index.less +++ b/components/button/style/index.less @@ -1,4 +1,4 @@ -@import '../../style/themes/default'; +@import '../../style/themes/index'; @import '../../style/mixins/index'; @import './mixin'; @@ -69,6 +69,10 @@ .btn-danger; } + &-link { + .btn-link; + } + &-round { .btn-round(@btn-prefix-cls); } @@ -90,8 +94,8 @@ border-radius: inherit; opacity: 0.35; transition: opacity 0.2s; - pointer-events: none; content: ''; + pointer-events: none; } .@{iconfont-css-prefix} { @@ -107,14 +111,17 @@ } } + &&-loading { + position: relative; + pointer-events: none; + } + &&-loading::before { display: block; } &&-loading:not(&-circle):not(&-circle-outline):not(&-icon-only) { - position: relative; padding-left: 29px; - pointer-events: none; .@{iconfont-css-prefix}:not(:last-child) { margin-left: -14px; } @@ -162,6 +169,12 @@ .button-variant-ghost(@btn-danger-color); } + &-background-ghost&-link { + .button-variant-ghost(@link-color; transparent); + + color: @component-background; + } + &-two-chinese-chars::first-letter { letter-spacing: 0.34em; } diff --git a/components/button/style/mixin.less b/components/button/style/mixin.less index 58b0f6fd0f1..1aec902ef22 100644 --- a/components/button/style/mixin.less +++ b/components/button/style/mixin.less @@ -7,7 +7,7 @@ border-radius: @border-radius; } -.button-disabled() { +.button-disabled(@color: @btn-disable-color; @background: @btn-disable-bg; @border: @btn-disable-border) { &-disabled, &.disabled, &[disabled] { @@ -16,7 +16,8 @@ &:focus, &:active, &.active { - .button-color(@btn-disable-color; @btn-disable-bg; @btn-disable-border); + .button-color(@color; @background; @border); + text-shadow: none; box-shadow: none; } @@ -25,6 +26,7 @@ .button-variant-primary(@color; @background) { .button-color(@color; @background; @background); + text-shadow: @btn-text-shadow; box-shadow: @btn-primary-shadow; @@ -84,16 +86,26 @@ } .button-disabled(); } -.button-variant-ghost(@color) { - .button-color(@color; transparent; @color); +.button-variant-ghost(@color; @border: @color) { + .button-color(@color; transparent; @border); text-shadow: none; &:hover, &:focus { - .button-color(~`colorPalette('@{color}', 5) `; transparent; ~`colorPalette('@{color}', 5) `); + & when (@border = transparent) { + .button-color(~`colorPalette('@{color}', 5) `; transparent; transparent); + } + & when not(@border = transparent) { + .button-color(~`colorPalette('@{color}', 5) `; transparent; ~`colorPalette('@{color}', 5) `); + } } &:active, &.active { - .button-color(~`colorPalette('@{color}', 7) `; transparent; ~`colorPalette('@{color}', 7) `); + & when (@border = transparent) { + .button-color(~`colorPalette('@{color}', 7) `; transparent; transparent); + } + & when not(@border = transparent) { + .button-color(~`colorPalette('@{color}', 7) `; transparent; ~`colorPalette('@{color}', 7) `); + } } .button-disabled(); } @@ -220,6 +232,17 @@ .btn-danger() { .button-variant-danger(@btn-danger-color, @btn-danger-bg, @btn-danger-border); } +// link button style +.btn-link() { + .button-variant-other(@link-color, transparent, transparent); + box-shadow: none; + &:hover, + &:focus, + &:active { + border-color: transparent; + } + .button-disabled(@disabled-color; transparent; transparent); +} // round button .btn-round(@btnClassName: btn) { .button-size(@btn-circle-size; 0 @btn-circle-size / 2; @font-size-base + 2px; @btn-circle-size); @@ -247,7 +270,7 @@ .button-size(@btn-circle-size-sm; 0; @font-size-base; 50%); } } -// Horizontal button groups styl +// Horizontal button groups style // -------------------------------------------------- .btn-group(@btnClassName: btn) { .button-group-base(@btnClassName); diff --git a/components/calendar/style/index.less b/components/calendar/style/index.less index e1e908209b0..32b1c057845 100644 --- a/components/calendar/style/index.less +++ b/components/calendar/style/index.less @@ -1,10 +1,11 @@ -@import '../../style/themes/default'; +@import '../../style/themes/index'; @import '../../style/mixins/index'; @full-calendar-prefix-cls: ~'@{ant-prefix}-fullcalendar'; .@{full-calendar-prefix-cls} { .reset-component; + border-top: @border-width-base @border-style-base @border-color-base; outline: none; @@ -21,7 +22,7 @@ margin-left: 8px; &.@{ant-prefix}-select-sm { - min-width: 60px; + min-width: 70px; } } diff --git a/components/card/style/index.less b/components/card/style/index.less index 370173fb3d8..b23e8fc3ea2 100644 --- a/components/card/style/index.less +++ b/components/card/style/index.less @@ -1,4 +1,4 @@ -@import '../../style/themes/default'; +@import '../../style/themes/index'; @import '../../style/mixins/index'; @card-prefix-cls: ~'@{ant-prefix}-card'; @@ -10,6 +10,7 @@ .@{card-prefix-cls} { .reset-component; + position: relative; background: @component-background; border-radius: @card-radius; diff --git a/components/carousel/style/index.less b/components/carousel/style/index.less index ddb3c4b893d..a8376fd25df 100644 --- a/components/carousel/style/index.less +++ b/components/carousel/style/index.less @@ -1,4 +1,4 @@ -@import '../../style/themes/default'; +@import '../../style/themes/index'; @import '../../style/mixins/index'; .@{ant-prefix}-carousel { @@ -146,7 +146,6 @@ // Dots .slick-dots { position: absolute; - bottom: 12px; display: block; width: 100%; height: @carousel-dot-height; @@ -154,6 +153,12 @@ padding: 0; text-align: center; list-style: none; + &-bottom { + bottom: 12px; + } + &-top { + top: 12px; + } li { position: relative; display: inline-block; @@ -196,11 +201,16 @@ .@{ant-prefix}-carousel-vertical { .slick-dots { top: 50%; - right: 12px; bottom: auto; width: @carousel-dot-height; height: auto; transform: translateY(-50%); + &-left { + left: 12px; + } + &-right { + right: 12px; + } li { margin: 0 2px; vertical-align: baseline; diff --git a/components/cascader/style/index.less b/components/cascader/style/index.less index e4353fd00f0..eeb0a53d238 100644 --- a/components/cascader/style/index.less +++ b/components/cascader/style/index.less @@ -1,4 +1,4 @@ -@import '../../style/themes/default'; +@import '../../style/themes/index'; @import '../../style/mixins/index'; @import '../../input/style/mixin'; @@ -8,7 +8,8 @@ .reset-component; &-input.@{ant-prefix}-input { - position: relative; + // Keep it static for https://github.com/ant-design/ant-design/issues/16738 + position: static; width: 100%; // Add important to fix https://github.com/ant-design/ant-design/issues/5078 // because input.less will compile after cascader.less @@ -22,6 +23,7 @@ &-picker { .reset-component; + position: relative; display: inline-block; background-color: @component-background; @@ -108,6 +110,11 @@ } } + // https://github.com/ant-design/ant-design/pull/12407#issuecomment-424657810 + &-picker-label:hover + &-input { + .hover; + } + &-picker-small &-picker-clear, &-picker-small &-picker-arrow { right: @control-padding-horizontal-sm; @@ -194,8 +201,8 @@ &-active:not(&-disabled) { &, &:hover { - font-weight: 600; - background: @background-color-base; + font-weight: @select-item-selected-font-weight; + background-color: @background-color-light; } } &-expand { @@ -206,6 +213,7 @@ &-expand &-expand-icon, &-expand &-loading-icon { .iconfont-size-under-12px(10px); + position: absolute; right: @control-padding-horizontal; color: @text-color-secondary; diff --git a/components/checkbox/style/index.less b/components/checkbox/style/index.less index 2d669f4f72a..3f50d589733 100644 --- a/components/checkbox/style/index.less +++ b/components/checkbox/style/index.less @@ -1,4 +1,4 @@ -@import '../../style/themes/default'; +@import '../../style/themes/index'; @import './mixin'; .antCheckboxFn(); diff --git a/components/checkbox/style/mixin.less b/components/checkbox/style/mixin.less index 5454c9aca9f..6e136528a03 100644 --- a/components/checkbox/style/mixin.less +++ b/components/checkbox/style/mixin.less @@ -5,6 +5,7 @@ // 一般状态 .@{checkbox-prefix-cls} { .reset-component; + position: relative; top: -0.09em; display: inline-block; @@ -57,6 +58,7 @@ &::after { @check-width: (@checkbox-size / 14) * 5px; @check-height: (@checkbox-size / 14) * 8px; + position: absolute; top: 50%; left: 21%; @@ -139,6 +141,7 @@ .@{checkbox-prefix-cls}-wrapper { .reset-component; + display: inline-block; line-height: unset; cursor: pointer; @@ -155,6 +158,7 @@ .@{checkbox-prefix-cls}-group { .reset-component; + display: inline-block; &-item { display: inline-block; @@ -177,6 +181,7 @@ .@{checkbox-inner-prefix-cls}::after { @indeterminate-width: @checkbox-size - 8px; @indeterminate-height: @checkbox-size - 8px; + top: 50%; left: 50%; width: @indeterminate-width; diff --git a/components/collapse/style/index.less b/components/collapse/style/index.less index 5db9b1454cc..93791bfba33 100644 --- a/components/collapse/style/index.less +++ b/components/collapse/style/index.less @@ -1,10 +1,11 @@ -@import '../../style/themes/default'; +@import '../../style/themes/index'; @import '../../style/mixins/index'; @collapse-prefix-cls: ~'@{ant-prefix}-collapse'; .@{collapse-prefix-cls} { .reset-component; + background-color: @collapse-header-bg; border: @border-width-base @border-style-base @border-color-base; border-bottom: 0; @@ -23,6 +24,7 @@ > .@{collapse-prefix-cls}-header { position: relative; padding: @collapse-header-padding; + padding-left: @collapse-header-padding-extra; color: @heading-color; line-height: 22px; cursor: pointer; @@ -30,6 +32,7 @@ .@{collapse-prefix-cls}-arrow { .iconfont-mixin(); + position: absolute; top: 50%; left: @padding-md; @@ -60,6 +63,21 @@ } } + // Expand Icon right + &-icon-position-right { + & > .@{collapse-prefix-cls}-item { + > .@{collapse-prefix-cls}-header { + padding: @collapse-header-padding; + padding-right: @collapse-header-padding-extra; + + .@{collapse-prefix-cls}-arrow { + right: @padding-md; + left: initial; + } + } + } + } + &-anim-active { transition: height 0.2s @ease-out; } diff --git a/components/comment/style/index.less b/components/comment/style/index.less index 573308f1b38..78548a27abd 100644 --- a/components/comment/style/index.less +++ b/components/comment/style/index.less @@ -1,4 +1,4 @@ -@import '../../style/themes/default'; +@import '../../style/themes/index'; @import '../../style/mixins/index'; @comment-prefix-cls: ~'@{ant-prefix}-comment'; diff --git a/components/date-picker/style/Calendar.less b/components/date-picker/style/Calendar.less index 2a8cdc5462b..95eb1601aa6 100644 --- a/components/date-picker/style/Calendar.less +++ b/components/date-picker/style/Calendar.less @@ -342,6 +342,7 @@ .btn; .btn-primary; .button-size(@btn-height-sm; @btn-padding-sm; @font-size-base; @border-radius-base); + line-height: @btn-height-sm - 2px; .button-disabled(); diff --git a/components/date-picker/style/Picker.less b/components/date-picker/style/Picker.less index d212460f0ac..c0fd7d269ec 100644 --- a/components/date-picker/style/Picker.less +++ b/components/date-picker/style/Picker.less @@ -2,6 +2,7 @@ .@{calendar-prefix-cls}-picker-container { .reset-component; + position: absolute; z-index: @zindex-picker; font-family: @font-family; @@ -33,6 +34,7 @@ .@{calendar-prefix-cls}-picker { .reset-component; + position: relative; display: inline-block; outline: none; diff --git a/components/date-picker/style/RangePicker.less b/components/date-picker/style/RangePicker.less index 16f4dccbf74..b8acbe2511d 100644 --- a/components/date-picker/style/RangePicker.less +++ b/components/date-picker/style/RangePicker.less @@ -96,6 +96,7 @@ .@{calendar-prefix-cls}-input, .@{calendar-timepicker-prefix-cls}-input { .input; + height: @input-height-sm; padding-right: 0; padding-left: 0; diff --git a/components/date-picker/style/index.less b/components/date-picker/style/index.less index d8e6026dc71..14eedcced97 100644 --- a/components/date-picker/style/index.less +++ b/components/date-picker/style/index.less @@ -1,4 +1,4 @@ -@import '../../style/themes/default'; +@import '../../style/themes/index'; @import '../../style/mixins/index'; @import '../../input/style/mixin'; @import '../../button/style/mixin'; diff --git a/components/divider/style/index.less b/components/divider/style/index.less index c8c3bf88006..bb3110481c8 100644 --- a/components/divider/style/index.less +++ b/components/divider/style/index.less @@ -1,10 +1,11 @@ -@import '../../style/themes/default'; +@import '../../style/themes/index'; @import '../../style/mixins/index'; @divider-prefix-cls: ~'@{ant-prefix}-divider'; .@{divider-prefix-cls} { .reset-component; + background: @border-color-split; &, /* for compatiable */ diff --git a/components/drawer/style/drawer.less b/components/drawer/style/drawer.less index 2781d4ccca3..228c5851654 100644 --- a/components/drawer/style/drawer.less +++ b/components/drawer/style/drawer.less @@ -1,4 +1,4 @@ -@import '../../style/themes/default'; +@import '../../style/themes/index'; // Preserve the typo for compatibility // https://github.com/ant-design/ant-design/issues/14628 @@ -8,7 +8,6 @@ .@{drawer-prefix-cls} { position: fixed; - top: 0; z-index: @zindex-modal; width: 0%; height: 100%; @@ -25,8 +24,10 @@ width: 100%; height: 100%; } + &-left, &-right { + top: 0; width: 0%; height: 100%; .@{drawer-prefix-cls}-content-wrapper { @@ -39,6 +40,7 @@ width: 0%; } } + &-left { &.@{drawer-prefix-cls}-open { .@{drawer-prefix-cls}-content-wrapper { @@ -46,7 +48,10 @@ } } } + &-right { + right: 0; + .@{drawer-prefix-cls} { &-content-wrapper { right: 0; @@ -61,8 +66,10 @@ &-top, &-bottom { + left: 0; width: 100%; height: 0%; + .@{drawer-prefix-cls}-content-wrapper { width: 100%; } @@ -73,14 +80,20 @@ height: 0%; } } + &-top { + top: 0; + &.@{drawer-prefix-cls}-open { .@{drawer-prefix-cls}-content-wrapper { box-shadow: @shadow-1-down; } } } + &-bottom { + bottom: 0; + .@{drawer-prefix-cls} { &-content-wrapper { bottom: 0; @@ -92,6 +105,7 @@ } } } + &.@{drawer-prefix-cls}-open { .@{drawer-prefix-cls} { &-mask { @@ -173,6 +187,8 @@ &-mask { position: fixed; + top: 0; + left: 0; width: 100%; height: 0; background-color: @modal-mask-bg; diff --git a/components/drawer/style/index.less b/components/drawer/style/index.less index a081a08ca72..79d170c750e 100644 --- a/components/drawer/style/index.less +++ b/components/drawer/style/index.less @@ -1,3 +1,3 @@ -@import '../../style/themes/default'; +@import '../../style/themes/index'; @import '../../style/mixins/index'; @import './drawer'; diff --git a/components/dropdown/style/index.less b/components/dropdown/style/index.less index 8603ead6851..ffba8cd9390 100644 --- a/components/dropdown/style/index.less +++ b/components/dropdown/style/index.less @@ -1,10 +1,11 @@ -@import '../../style/themes/default'; +@import '../../style/themes/index'; @import '../../style/mixins/index'; @dropdown-prefix-cls: ~'@{ant-prefix}-dropdown'; .@{dropdown-prefix-cls} { .reset-component; + position: absolute; top: -9999px; left: -9999px; diff --git a/components/empty/style/index.less b/components/empty/style/index.less index 535109d93e4..c56297ce35a 100644 --- a/components/empty/style/index.less +++ b/components/empty/style/index.less @@ -1,4 +1,4 @@ -@import '../../style/themes/default'; +@import '../../style/themes/index'; @import '../../style/mixins/index'; @empty-prefix-cls: ~'@{ant-prefix}-empty'; diff --git a/components/form/style/index.less b/components/form/style/index.less index 8911b52e454..11974f3ee7d 100644 --- a/components/form/style/index.less +++ b/components/form/style/index.less @@ -1,4 +1,4 @@ -@import '../../style/themes/default'; +@import '../../style/themes/index'; @import '../../style/mixins/index'; @import '../../input/style/mixin'; @import '../../button/style/mixin'; @@ -98,6 +98,7 @@ input[type='checkbox'] { } .reset-component; + margin-bottom: @form-item-margin-bottom; vertical-align: top; @@ -112,7 +113,7 @@ input[type='checkbox'] { } &-with-help { - margin-bottom: @form-item-margin-bottom - @form-explain-height - @form-help-margin-top; + margin-bottom: max(0, @form-item-margin-bottom - @form-explain-height - @form-help-margin-top); } &-label { @@ -162,13 +163,16 @@ input[type='checkbox'] { text-align: center; } -// 表单下的输入框尺寸唯一: 大尺寸 form { .has-feedback { .@{ant-prefix}-input { padding-right: 24px; } + .@{ant-prefix}-input-password-icon { + margin-right: 18px; + } + // Fix overlapping between feedback icon and