Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: optimize Input presuffix style(#17414) #17508

Merged
merged 1 commit into from Jul 8, 2019
Merged

fix: optimize Input presuffix style(#17414) #17508

merged 1 commit into from Jul 8, 2019

Conversation

ghost
Copy link

@ghost ghost commented Jul 7, 2019 •
edited by ghost

🤔 This is a ...

  • New feature
  • Bug fix
  • Site / document update
  • Component style update
  • TypeScript definition update
  • Refactoring
  • Code style optimization
  • Test Case
  • Branch merge
  • Other (about what?)

👻 What's the background?

close #17414

💡 Solution

📝 Changelog

Language Changelog
🇺🇸 English Optimize Input multiple suffixes style
🇨🇳 Chinese 优化 Input 多个后缀图标的样式

☑️ Self Check before Merge

  • Doc is updated/provided or not needed
  • Demo is updated/provided or not needed
  • TypeScript definition is updated/provided or not needed
  • Changelog is provided or not needed

@netlify
Copy link

netlify bot commented Jul 7, 2019 •
edited

Deploy preview for ant-design ready!

Built with commit 9691d2b

https://deploy-preview-17508--ant-design.netlify.com

@codecov
Copy link

codecov bot commented Jul 7, 2019

Codecov Report

Merging #17508 into master will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@           Coverage Diff           @@
##           master   #17508   +/-   ##
=======================================
  Coverage   96.03%   96.03%           
=======================================
  Files         267      267           
  Lines        7419     7419           
  Branches     2029     2029           
=======================================
  Hits         7125     7125           
  Misses        292      292           
  Partials        2        2

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update bc6c0f1...9691d2b. Read the comment docs.

1 similar comment
@codecov
Copy link

codecov bot commented Jul 7, 2019 •
edited

Codecov Report

Merging #17508 into master will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@           Coverage Diff           @@
##           master   #17508   +/-   ##
=======================================
  Coverage   96.03%   96.03%           
=======================================
  Files         267      267           
  Lines        7419     7419           
  Branches     2029     2029           
=======================================
  Hits         7125     7125           
  Misses        292      292           
  Partials        2        2

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update bc6c0f1...9691d2b. Read the comment docs.

@afc163 afc163 merged commit 2023e86 into ant-design:master Jul 8, 2019
okoala
okoala reviewed Jul 13, 2019
View reviewed changes
components/input/style/mixin.less
@@ -373,9 +373,17 @@
color: @input-color;
line-height: 0;
transform: translateY(-50%);
background-color: #fff;
height: calc(100% - 2px);
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

不需要设 backgroud-color 的吧，还有 height 也有问题

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

有多个suffix时.ant-input-suffix覆盖在input上面，设置background-color和height是想用.ant-input-suffix覆盖住input输入框。实际上这里判断suffix的数量来修改padding-right应该是更优的方案。
height这里应该把padding减去？

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

应该用 padding，#fff 太粗暴了……

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@zombieJ 请老朱背锅😂

@dengfuping
Copy link
Contributor

@LilyWakana 对的，之前的修复方法比较 hack，按理不应该合进去的。根据后者的思路，能否帮忙提下 PR？

@yoyo837
Copy link
Contributor

yoyo837 commented Jul 15, 2019

@LilyWakana height: calc(100% - 2px); 需要改 calc(~'100% - 2px')

@yoyo837
Copy link
Contributor

yoyo837 commented Jul 15, 2019

其他问题： #17414 (comment)

@ghost
Copy link
Author

ghost commented Jul 15, 2019

@LilyWakana 对的，之前的修复方法比较 hack，按理不应该合进去的。根据后者的思路，能否帮忙提下 PR？

好的。

@yesmeck yesmeck mentioned this pull request Jul 15, 2019
Merged
14 tasks
zombieJ pushed a commit that referenced this pull request Jul 15, 2019
@yesmeck @zombieJ
Revert #17508 (#17639)
5b7c922 
* Revert "fix: Style property orders"

This reverts commit 54a992c.

* Revert "fix: optimize Input presuffix style(#17414)"

This reverts commit 9691d2b.
@yesmeck yesmeck mentioned this pull request Jul 15, 2019
Merged
@ghost
Copy link
Author

ghost commented Jul 16, 2019

这个pr好像不能reopen了，重新提了一个 #17684

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Input：当自定义后缀图标和清除图标同时存在时，显示错误
5 participants
@dengfuping @yoyo837 @okoala @zombieJ @afc163