From 014f951489f5ae7e869d24e6a6f48993c5c8c4c1 Mon Sep 17 00:00:00 2001 From: ng-zorro-bot Date: Wed, 19 Jun 2019 04:37:45 +0000 Subject: [PATCH] chore: sync ant-design v3.19.6 --- components/card/style/index.less | 2 +- components/date-picker/style/Picker.less | 4 ++++ components/date-picker/style/RangePicker.less | 1 - components/input/style/mixin.less | 1 + 4 files changed, 6 insertions(+), 2 deletions(-) diff --git a/components/card/style/index.less b/components/card/style/index.less index b23e8fc3ea..a198bdd37a 100644 --- a/components/card/style/index.less +++ b/components/card/style/index.less @@ -109,7 +109,7 @@ padding-bottom: 0; } - &-contain-tabs &-extra { + &-contain-tabs > &-head &-extra { padding-bottom: 0; } diff --git a/components/date-picker/style/Picker.less b/components/date-picker/style/Picker.less index c0fd7d269e..0d3c36e3af 100644 --- a/components/date-picker/style/Picker.less +++ b/components/date-picker/style/Picker.less @@ -43,6 +43,10 @@ &-input { outline: none; + + &.@{ant-prefix}-input { + line-height: @line-height-base; + } } &-input.@{ant-prefix}-input-sm { diff --git a/components/date-picker/style/RangePicker.less b/components/date-picker/style/RangePicker.less index 9027cab589..b8acbe2511 100644 --- a/components/date-picker/style/RangePicker.less +++ b/components/date-picker/style/RangePicker.less @@ -7,7 +7,6 @@ background-color: transparent; border: 0; outline: 0; - vertical-align: top; .placeholder(); &[disabled] { diff --git a/components/input/style/mixin.less b/components/input/style/mixin.less index 0bc2b8f0c6..b5d22ed13b 100644 --- a/components/input/style/mixin.less +++ b/components/input/style/mixin.less @@ -82,6 +82,7 @@ min-height: @input-height-base; vertical-align: bottom; transition: all 0.3s, height 0s; + line-height: @line-height-base; } // Size