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

fix(module:avatar): Prioritize icons and text #4138

Closed
wants to merge 2 commits into from
Closed

fix(module:avatar): Prioritize icons and text #4138

wants to merge 2 commits into from

Conversation

Eusen
Copy link

@Eusen Eusen commented Sep 10, 2019

PR Checklist

Please check if your PR fulfills the following requirements:

PR Type

What kind of change does this PR introduce?

[x] Bugfix
[ ] Feature
[ ] Code style update (formatting, local variables)
[ ] Refactoring (no functional changes, no api changes)
[ ] Build related changes
[ ] CI related changes
[ ] Documentation content changes
[ ] Application (the showcase website) / infrastructure changes
[ ] Other... Please describe:

What is the current behavior?

  1. avatar img 非正方形时会被压缩
  2. 同时存在text与icon时,两者都会被显示出来
    Issue Number: N/A

What is the new behavior?

利用 object-fit: cover 解决了 avatar 图片被压缩的问题
提高了 text 的优先级,同时存在 icon 和 text,会优先显示text

Does this PR introduce a breaking change?

[ ] Yes
[x] No

Other information

@netlify
Copy link

netlify bot commented Sep 10, 2019

Deploy preview for ng-zorro-master ready!

Built with commit bf616c0

https://deploy-preview-4138--ng-zorro-master.netlify.com

@hsuanxyz
Copy link
Member

hsuanxyz commented Sep 11, 2019

@Eusen NG-ZORRO 的样式应该与 https://github.com/ant-design/ant-design 保持同步,你可以向他们提交 PR,合并后我们将自动同步样式

@Eusen
Copy link
Author

Eusen commented Sep 11, 2019

@Eusen NG-ZORRO 的样式应该与 https://github.com/ant-design/ant-design 保持同步,你可以向他们提交 PR,合并后我们将自动同步样式

那这里的修改我给他删掉?

@codecov
Copy link

codecov bot commented Sep 11, 2019

Codecov Report

Merging #4138 into master will decrease coverage by 0.01%.
The diff coverage is 50%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #4138      +/-   ##
==========================================
- Coverage   92.27%   92.25%   -0.02%     
==========================================
  Files         517      517              
  Lines       10961    10961              
  Branches     1985     1985              
==========================================
- Hits        10114    10112       -2     
- Misses        421      422       +1     
- Partials      426      427       +1
Impacted Files Coverage Δ
components/avatar/nz-avatar.component.ts 95.31% <50%> (-3.13%) ⬇️

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 0f6906f...bf616c0. Read the comment docs.

@Eusen Eusen changed the title fix(module:avatar): resolve image compression fix(module:avatar): Prioritize icons and text Sep 11, 2019
@hsuanxyz
Copy link
Member

@Eusen Hi,你需要 Rebase 一下 Master 代码,我们刚才修复了一个 CI 的问题

@Eusen
Copy link
Author

Eusen commented Sep 12, 2019

@Eusen Hi,你需要 Rebase 一下 Master 代码,我们刚才修复了一个 CI 的问题

了解

@wenqi73 wenqi73 assigned hsuanxyz and unassigned wenqi73 Sep 20, 2019
Copy link
Member

@vthinkxie vthinkxie left a comment

Choose a reason for hiding this comment

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

Hi @Eusen 请 rebase onto master ,否则 ci 会有问题

@Eusen
Copy link
Author

Eusen commented Oct 26, 2019

恕在下git玩的不是很6,确实不知道该怎么操作。。
前段时间尝试过,但是没什么反应,rebase不到东西。

@Eusen Eusen closed this Oct 26, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants