From f724e72360793c3ba2f99961b933c5e394896047 Mon Sep 17 00:00:00 2001 From: zombiej Date: Thu, 21 Feb 2019 12:08:35 +0800 Subject: [PATCH] update style --- components/input/index.en-US.md | 2 +- components/input/index.zh-CN.md | 2 +- components/input/style/search-input.less | 16 +++++++++------- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/components/input/index.en-US.md b/components/input/index.en-US.md index ea85bf72e61f..01ead88c7bad 100644 --- a/components/input/index.en-US.md +++ b/components/input/index.en-US.md @@ -56,7 +56,7 @@ The rest of the props of `Input.TextArea` are the same as the original [textarea | Property | Description | Type | Default | | -------- | ----------- | ---- | ------- | -| enterButton | to show an enter button after input | boolean\|ReactNode | false | +| enterButton | to show an enter button after input. This prop is conflict with addon. | boolean\|ReactNode | false | | onSearch | The callback function that is triggered when you click on the search-icon or press Enter key. | function(value, event) | | Supports all props of `Input`. diff --git a/components/input/index.zh-CN.md b/components/input/index.zh-CN.md index b6d107987191..31f3cf69e8c0 100644 --- a/components/input/index.zh-CN.md +++ b/components/input/index.zh-CN.md @@ -53,7 +53,7 @@ Input 的其他属性和 React 自带的 [input](https://facebook.github.io/reac | 参数 | 说明 | 类型 | 默认值 | | --- | --- | --- | --- | -| enterButton | 是否有确认按钮，可设为按钮文字 | boolean\|ReactNode | false | +| enterButton | 是否有确认按钮，可设为按钮文字。该属性会与 addon 冲突。 | boolean\|ReactNode | false | | onSearch | 点击搜索或按下回车键时的回调 | function(value, event) | | 其余属性和 Input 一致。 diff --git a/components/input/style/search-input.less b/components/input/style/search-input.less index 1cb161b56d3f..30ca98d894cf 100644 --- a/components/input/style/search-input.less +++ b/components/input/style/search-input.less @@ -15,14 +15,16 @@ } } - .@{ant-prefix}-input-group-addon { - padding: 0; - border: 0; + &-enter-button { + .@{ant-prefix}-input-group-addon { + padding: 0; + border: 0; - .@{search-prefix}-button { - width: 100%; - border-top-left-radius: 0; - border-bottom-left-radius: 0; + .@{search-prefix}-button { + width: 100%; + border-top-left-radius: 0; + border-bottom-left-radius: 0; + } } } }