From 3dbe7c2e4392719852aec390101532bcd578dcb9 Mon Sep 17 00:00:00 2001 From: ng-zorro-bot <33472860+ng-zorro-bot@users.noreply.github.com> Date: Wed, 19 Jun 2019 14:29:27 +0800 Subject: [PATCH] chore: sync ant-design v3.19.6 (#3602) --- 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 b23e8fc3ea2..a198bdd37a3 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 c0fd7d269ec..0d3c36e3af1 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 9027cab589a..b8acbe2511d 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 0bc2b8f0c6d..b5d22ed13b2 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