diff --git a/components/badge/style/index.less b/components/badge/style/index.less index 0458f5316..78616faa5 100644 --- a/components/badge/style/index.less +++ b/components/badge/style/index.less @@ -25,6 +25,7 @@ font-weight: @badge-font-weight; white-space: nowrap; box-shadow: 0 0 0 1px #fff; + z-index: 10; a, a:hover { color: #fff; @@ -80,7 +81,7 @@ height: 100%; border-radius: 50%; border: 1px solid @processing-color; - content: ''; + content: ""; animation: antStatusProcessing 1.2s infinite ease-in-out; } } diff --git a/components/button/style/index.less b/components/button/style/index.less index bd929d5a0..fee28d969 100644 --- a/components/button/style/index.less +++ b/components/button/style/index.less @@ -82,7 +82,7 @@ right: -1px; background: #fff; opacity: 0.35; - content: ''; + content: ""; border-radius: inherit; z-index: 1; transition: opacity .2s; @@ -163,7 +163,7 @@ } .christmas&-primary:before { - content: ''; + content: ""; display: block; position: absolute; top: -6px; diff --git a/components/button/style/mixin.less b/components/button/style/mixin.less index 2848772fd..138ca4903 100644 --- a/components/button/style/mixin.less +++ b/components/button/style/mixin.less @@ -101,7 +101,7 @@ > a:only-child { color: currentColor; &:after { - content: ''; + content: ""; position: absolute; top: 0; left: 0; diff --git a/components/carousel/style/index.less b/components/carousel/style/index.less index 613f42bcb..64d1267c7 100644 --- a/components/carousel/style/index.less +++ b/components/carousel/style/index.less @@ -27,6 +27,14 @@ &.dragging { cursor: pointer; } + + .slick-slide { + pointer-events: none; + + &.slick-active { + pointer-events: auto; + } + } } .slick-slider .slick-track, .slick-slider .slick-list { diff --git a/components/checkbox/style/mixin.less b/components/checkbox/style/mixin.less index 023ea25e1..81fc57010 100644 --- a/components/checkbox/style/mixin.less +++ b/components/checkbox/style/mixin.less @@ -28,7 +28,7 @@ height: 100%; border-radius: @border-radius-sm; border: 1px solid @checkbox-color; - content: ''; + content: ""; animation: antCheckboxEffect 0.36s ease-in-out; animation-fill-mode: both; visibility: hidden; @@ -46,7 +46,7 @@ display: block; width: @checkbox-size; height: @checkbox-size; - border: @border-width-base @border-style-base @border-color-base; + border: @checkbox-border-width @border-style-base @border-color-base; border-radius: @border-radius-sm; background-color: @checkbox-check-color; transition: all .3s; diff --git a/components/date-picker/style/Picker.less b/components/date-picker/style/Picker.less index 9af9f2dff..b9b085a88 100644 --- a/components/date-picker/style/Picker.less +++ b/components/date-picker/style/Picker.less @@ -42,6 +42,11 @@ outline: none; } + &-input.@{ant-prefix}-input-sm { + padding-top: 0; + padding-bottom: 0; + } + &:hover &-input:not(.@{ant-prefix}-input-disabled) { border-color: @primary-color; } diff --git a/components/date-picker/style/RangePicker.less b/components/date-picker/style/RangePicker.less index e8dee5a83..62cfe035d 100644 --- a/components/date-picker/style/RangePicker.less +++ b/components/date-picker/style/RangePicker.less @@ -134,7 +134,7 @@ z-index: 1; } &:before { - content: ''; + content: ""; display: block; background: @item-active-bg; border-radius: 0; diff --git a/components/date-picker/style/TimePicker.less b/components/date-picker/style/TimePicker.less index 25e080cdc..6bda07546 100644 --- a/components/date-picker/style/TimePicker.less +++ b/components/date-picker/style/TimePicker.less @@ -90,7 +90,7 @@ } li:last-child:after { - content: ''; + content: ""; height: 202px; display: block; } diff --git a/components/divider/style/index.less b/components/divider/style/index.less index 6839add3b..c7e641189 100644 --- a/components/divider/style/index.less +++ b/components/divider/style/index.less @@ -39,7 +39,7 @@ margin: 16px 0; &:before, &:after { - content: ''; + content: ""; display: table-cell; position: relative; top: 50%; diff --git a/components/dropdown/style/index.less b/components/dropdown/style/index.less index 447d2fdff..ec0e955b0 100644 --- a/components/dropdown/style/index.less +++ b/components/dropdown/style/index.less @@ -187,7 +187,7 @@ .@{dropdown-prefix-cls}-trigger, .@{dropdown-prefix-cls}-link { - .@{iconfont-css-prefix}:not(.@{iconfont-css-prefix}-ellipsis) { + > .@{iconfont-css-prefix}:not(.@{iconfont-css-prefix}-ellipsis) { .iconfont-size-under-12px(10px); } } diff --git a/components/form/style/mixin.less b/components/form/style/mixin.less index 644886be5..1004c5dcf 100644 --- a/components/form/style/mixin.less +++ b/components/form/style/mixin.less @@ -91,7 +91,7 @@ input[type="radio"]:focus, input[type="checkbox"]:focus { outline: thin dotted; - outline: 5px auto -webkit-focus-ring-color; // lesshint duplicateProperty: false + outline: 5px auto -webkit-focus-ring-color; outline-offset: -2px; } diff --git a/components/grid/style/mixin.less b/components/grid/style/mixin.less index fd95df193..bac74f319 100644 --- a/components/grid/style/mixin.less +++ b/components/grid/style/mixin.less @@ -49,7 +49,6 @@ .col(1); // kickstart it } -// lesshint false .loop-grid-columns(@index, @class) when (@index > 0) { .@{ant-prefix}-col@{class}-@{index} { display: block; diff --git a/components/input/style/mixin.less b/components/input/style/mixin.less index 4eaccdeec..5f8ffaa33 100644 --- a/components/input/style/mixin.less +++ b/components/input/style/mixin.less @@ -160,7 +160,7 @@ // Reset Select's style in addon .@{ant-prefix}-select { - margin: -(@input-padding-vertical-base + 1px) (-@input-padding-horizontal-base); // lesshint spaceAroundOperator: false + margin: -(@input-padding-vertical-base + 1px) (-@input-padding-horizontal-base); .@{ant-prefix}-select-selection { background-color: inherit; @@ -181,7 +181,7 @@ // https://github.com/ant-design/ant-design/issues/3714 > i:only-child:after { position: absolute; - content: ''; + content: ""; top: 0; left: 0; right: 0; diff --git a/components/menu/style/index.less b/components/menu/style/index.less index 14f3a0f05..0a3740dd4 100644 --- a/components/menu/style/index.less +++ b/components/menu/style/index.less @@ -67,7 +67,7 @@ left: 0; bottom: 0; right: 0; - content: ''; + content: ""; } } @@ -180,6 +180,7 @@ position: absolute; border-radius: @border-radius-base; z-index: @zindex-dropdown; + background: @menu-popup-bg; .submenu-title-wrapper { padding-right: 20px; @@ -216,7 +217,7 @@ width: 10px; &:before, &:after { - content: ''; + content: ""; position: absolute; vertical-align: baseline; background: #fff; diff --git a/components/modal/style/modal.less b/components/modal/style/modal.less index 761a2727f..7c40f9704 100644 --- a/components/modal/style/modal.less +++ b/components/modal/style/modal.less @@ -114,7 +114,7 @@ right: 0; left: 0; bottom: 0; - background-color: @modal-mask-bg; // lesshint duplicateProperty: false + background-color: @modal-mask-bg; height: 100%; z-index: @zindex-modal-mask; filter: ~"alpha(opacity=50)"; @@ -132,7 +132,7 @@ .@{dialog-prefix-cls}-centered { text-align: center; &:before { - content: ''; + content: ""; display: inline-block; height: 100%; vertical-align: middle; diff --git a/components/notification/style/index.less b/components/notification/style/index.less index 9f5e42c3d..aee8bacbc 100644 --- a/components/notification/style/index.less +++ b/components/notification/style/index.less @@ -58,7 +58,7 @@ display: block; max-width: 4px; &:before { - content: ''; + content: ""; display: block; } } diff --git a/components/radio/style/index.less b/components/radio/style/index.less index 7f5e6dcd8..b85768576 100644 --- a/components/radio/style/index.less +++ b/components/radio/style/index.less @@ -46,7 +46,7 @@ height: 100%; border-radius: 50%; border: 1px solid @radio-dot-color; - content: ''; + content: ""; animation: antRadioEffect 0.36s ease-in-out; animation-fill-mode: both; visibility: hidden; diff --git a/components/spin/style/index.less b/components/spin/style/index.less index c36f872ff..5a91d5277 100644 --- a/components/spin/style/index.less +++ b/components/spin/style/index.less @@ -90,7 +90,7 @@ filter: ~"progid\:DXImageTransform\.Microsoft\.Blur(PixelRadius\=1, MakeShadow\=false)"; &:after { - content: ''; + content: ""; position: absolute; left: 0; right: 0; diff --git a/components/steps/style/index.less b/components/steps/style/index.less index bcc5215ff..bae8e7ce0 100644 --- a/components/steps/style/index.less +++ b/components/steps/style/index.less @@ -82,7 +82,7 @@ top: 12px; padding: 0 10px; &:after { - content: ''; + content: ""; display: inline-block; background: @border-color-split; height: 1px; @@ -99,7 +99,7 @@ position: relative; line-height: @steps-icon-size; &:after { - content: ''; + content: ""; height: 1px; width: 9999px; background: @wait-tail-color; diff --git a/components/style/core/motion/other.less b/components/style/core/motion/other.less index e823753d8..6ad5a623d 100644 --- a/components/style/core/motion/other.less +++ b/components/style/core/motion/other.less @@ -11,7 +11,7 @@ [ant-click-animating-without-extra-node]:after, .ant-click-animating-node { - content: ''; + content: ""; position: absolute; top: -1px; left: -1px; diff --git a/components/style/mixins/iconfont.less b/components/style/mixins/iconfont.less index 112bebccd..a18f0c271 100644 --- a/components/style/mixins/iconfont.less +++ b/components/style/mixins/iconfont.less @@ -33,7 +33,7 @@ @font-scale: unit(@size / 12px); font-size: 12px; // IE9 - font-size: ~"@{size} \9"; // lesshint duplicateProperty: false + font-size: ~"@{size} \9"; transform: scale(@font-scale) rotate(@rotate); :root & { font-size: @font-size-sm; // reset IE9 and above diff --git a/components/style/themes/default.less b/components/style/themes/default.less index af1cc8e5e..7de75b370 100644 --- a/components/style/themes/default.less +++ b/components/style/themes/default.less @@ -160,6 +160,7 @@ @checkbox-size : 16px; @checkbox-color : @primary-color; @checkbox-check-color : #fff; +@checkbox-border-width : @border-width-base; // Radio @radio-size : 16px; @@ -321,7 +322,8 @@ @menu-inline-toplevel-item-height: 40px; @menu-item-height: 40px; @menu-collapsed-width: 80px; -@menu-bg: transparent; +@menu-bg: @component-background; +@menu-popup-bg: @component-background; @menu-item-color: @text-color; @menu-highlight-color: @primary-color; @menu-item-active-bg: @item-active-bg; diff --git a/components/switch/style/index.less b/components/switch/style/index.less index 6fb4feb79..51dbdadef 100644 --- a/components/switch/style/index.less +++ b/components/switch/style/index.less @@ -153,8 +153,11 @@ &-loading, &-disabled { - pointer-events: none; + cursor: not-allowed; opacity: @switch-disabled-opacity; + * { + cursor: not-allowed; + } } } diff --git a/components/table/style/index.less b/components/table/style/index.less index 77751b9e5..b45e82a9d 100644 --- a/components/table/style/index.less +++ b/components/table/style/index.less @@ -154,7 +154,7 @@ .@{table-prefix-cls}-column-sorters { &:before { position: absolute; - content: ''; + content: ""; top: 0; left: 0; right: 0; @@ -219,7 +219,7 @@ position: relative; border-top: @border-width-base @border-style-base @border-color-split; &:before { - content: ''; + content: ""; height: 1px; background: @table-header-bg; position: absolute; diff --git a/components/tabs/style/index.less b/components/tabs/style/index.less index 5bc9b8527..8b650f49d 100644 --- a/components/tabs/style/index.less +++ b/components/tabs/style/index.less @@ -305,6 +305,7 @@ .@{tab-prefix-cls}-ink-bar { width: 2px; + top: 0; left: auto; height: auto; bottom: auto; @@ -385,12 +386,12 @@ .@{tab-prefix-cls}-top .@{tab-prefix-cls}-ink-bar-animated, .@{tab-prefix-cls}-bottom .@{tab-prefix-cls}-ink-bar-animated { - transition: transform .3s @ease-in-out, width .3s @ease-in-out; + transition: transform .3s @ease-in-out, width .3s @ease-in-out, left .3s @ease-in-out; } .@{tab-prefix-cls}-left .@{tab-prefix-cls}-ink-bar-animated, .@{tab-prefix-cls}-right .@{tab-prefix-cls}-ink-bar-animated { - transition: transform .3s @ease-in-out, height .3s @ease-in-out; + transition: transform .3s @ease-in-out, height .3s @ease-in-out, top .3s @ease-in-out; } .no-flex, diff --git a/components/time-picker/style/index.less b/components/time-picker/style/index.less index e22a54edf..1ddca1af1 100644 --- a/components/time-picker/style/index.less +++ b/components/time-picker/style/index.less @@ -25,6 +25,7 @@ } &-input { + width: 100%; margin: 0; padding: 0; border: 0; diff --git a/components/tree/style/directory.less b/components/tree/style/directory.less index 18e8ab660..c33e683b2 100644 --- a/components/tree/style/directory.less +++ b/components/tree/style/directory.less @@ -42,7 +42,7 @@ } &:before { - content: ''; + content: ""; position: absolute; left: 0; right: 0; diff --git a/scripts/syncStyleFromAntd.js b/scripts/syncStyleFromAntd.js index 98608ebed..7e1ad8ac6 100644 --- a/scripts/syncStyleFromAntd.js +++ b/scripts/syncStyleFromAntd.js @@ -6,7 +6,7 @@ const path = require('path') const owner = 'ant-design' const repo = 'ant-design' -const tag = '3.10.7' +const tag = '3.10.9' const clientId = '5f6ccfdc4cdc69f8ba12' const clientSecret = process.env.CLIENT_SECRET