From b2d226555240cbeb3244720c7bf30d9d8c71f55d Mon Sep 17 00:00:00 2001 From: Meck Zhu Date: Mon, 15 Jul 2019 14:07:03 +0800 Subject: [PATCH 1/2] Revert "fix: Style property orders" This reverts commit 54a992c359e27ad567c3d10310dfd73a3f236700. --- components/button/style/index.less | 2 +- components/descriptions/style/index.less | 2 +- components/input/style/mixin.less | 6 +++--- components/mentions/style/index.less | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/components/button/style/index.less b/components/button/style/index.less index 903817690adc..1929c3484af2 100644 --- a/components/button/style/index.less +++ b/components/button/style/index.less @@ -24,8 +24,8 @@ > i, > span { display: inline-block; - transition: margin-left 0.3s @ease-in-out; pointer-events: none; + transition: margin-left 0.3s @ease-in-out; } &-primary { diff --git a/components/descriptions/style/index.less b/components/descriptions/style/index.less index c29fceae2187..6282cd7533be 100644 --- a/components/descriptions/style/index.less +++ b/components/descriptions/style/index.less @@ -53,8 +53,8 @@ &-item-no-label { &::after { - margin: 0; content: ''; + margin: 0; } } diff --git a/components/input/style/mixin.less b/components/input/style/mixin.less index 4dafe941ab45..ad1c2f74c213 100644 --- a/components/input/style/mixin.less +++ b/components/input/style/mixin.less @@ -370,18 +370,18 @@ position: absolute; top: 50%; z-index: 2; - height: calc(100% - 2px); color: @input-color; line-height: 0; - background-color: #fff; transform: translateY(-50%); + background-color: #fff; + height: calc(100% - 2px); :not(.anticon) { line-height: @line-height-base; } .anticon { position: relative; - top: 50%; vertical-align: top; + top: 50%; transform: translateY(-50%); } } diff --git a/components/mentions/style/index.less b/components/mentions/style/index.less index 29e43b62ec2b..8e2d5038ac07 100644 --- a/components/mentions/style/index.less +++ b/components/mentions/style/index.less @@ -11,9 +11,9 @@ position: relative; display: inline-block; height: auto; + line-height: unset; padding: 0; overflow: hidden; - line-height: unset; white-space: pre-wrap; vertical-align: bottom; From 61e0db5556951103247739ab98f3ee315082f4c4 Mon Sep 17 00:00:00 2001 From: Meck Zhu Date: Mon, 15 Jul 2019 14:07:13 +0800 Subject: [PATCH 2/2] Revert "fix: optimize Input presuffix style(#17414)" This reverts commit 9691d2bee1f931e421b97dc521507b14c25e5c0a. --- components/input/style/mixin.less | 8 -------- 1 file changed, 8 deletions(-) diff --git a/components/input/style/mixin.less b/components/input/style/mixin.less index ad1c2f74c213..d98c2a52903f 100644 --- a/components/input/style/mixin.less +++ b/components/input/style/mixin.less @@ -373,17 +373,9 @@ color: @input-color; line-height: 0; transform: translateY(-50%); - background-color: #fff; - height: calc(100% - 2px); :not(.anticon) { line-height: @line-height-base; } - .anticon { - position: relative; - vertical-align: top; - top: 50%; - transform: translateY(-50%); - } } .@{inputClass}-prefix {