From 1b5272ec18b38f9376efd2e73067cbeb7c64fd0f Mon Sep 17 00:00:00 2001 From: ng-zorro-bot <33472860+ng-zorro-bot@users.noreply.github.com> Date: Sat, 22 Jun 2019 11:14:15 +0800 Subject: [PATCH] chore: sync ant-design v3.19.7 (#3623) --- components/input/style/mixin.less | 2 +- components/layout/style/index.less | 1 + components/modal/style/modal.less | 2 ++ components/table/style/index.less | 7 ++++++- 4 files changed, 10 insertions(+), 2 deletions(-) diff --git a/components/input/style/mixin.less b/components/input/style/mixin.less index b5d22ed13b..d98c2a5290 100644 --- a/components/input/style/mixin.less +++ b/components/input/style/mixin.less @@ -80,9 +80,9 @@ max-width: 100%; // prevent textearea resize from coming out of its container height: auto; min-height: @input-height-base; + line-height: @line-height-base; vertical-align: bottom; transition: all 0.3s, height 0s; - line-height: @line-height-base; } // Size diff --git a/components/layout/style/index.less b/components/layout/style/index.less index 0fab878680..98dfe47e52 100644 --- a/components/layout/style/index.less +++ b/components/layout/style/index.less @@ -96,6 +96,7 @@ position: absolute; top: @layout-header-height; right: -@layout-zero-trigger-width; + z-index: 1; width: @layout-zero-trigger-width; height: @layout-zero-trigger-height; color: @layout-trigger-color; diff --git a/components/modal/style/modal.less b/components/modal/style/modal.less index 7322507f28..656e677791 100644 --- a/components/modal/style/modal.less +++ b/components/modal/style/modal.less @@ -11,6 +11,7 @@ width: auto; margin: 0 auto; padding-bottom: 24px; + pointer-events: none; &-wrap { position: fixed; @@ -40,6 +41,7 @@ border: 0; border-radius: @border-radius-base; box-shadow: @shadow-2; + pointer-events: auto; } &-close { diff --git a/components/table/style/index.less b/components/table/style/index.less index 5ec1764532..713b5847bf 100644 --- a/components/table/style/index.less +++ b/components/table/style/index.less @@ -22,7 +22,10 @@ } &-empty &-body { - overflow: auto !important; + // https://github.com/ant-design/ant-design/issues/11135 + overflow-x: auto !important; + // https://github.com/ant-design/ant-design/issues/17175 + overflow-y: hidden !important; } table { @@ -395,11 +398,13 @@ &-placeholder { position: relative; z-index: 1; + margin-top: -1px; padding: @table-padding-vertical @table-padding-horizontal; color: @disabled-color; font-size: @font-size-base; text-align: center; background: @component-background; + border-top: @border-width-base @border-style-base @border-color-split; border-bottom: @border-width-base @border-style-base @border-color-split; border-radius: 0 0 @border-radius-base @border-radius-base; .@{iconfont-css-prefix} {