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

Update Card & PageHeader style #15755

Merged
merged 6 commits into from Mar 31, 2019

Conversation

Projects
None yet
2 participants
@zombieJ
Copy link
Member

commented Mar 30, 2019

🤔 This is a ...

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

👻 What's the background?

ref: #15734

📝 Changelog description

Describe changes from userside, and list all potential break changes or other risks.

  1. Adjust Card and PageHeader padding from 32px to 24px.

  2. 调整 Card 和 PageHeader 样式将 padding 从 32px 改成 24px。

☑️ 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

zombieJ added some commits Mar 30, 2019

@codecov

This comment has been minimized.

Copy link

commented Mar 30, 2019

Codecov Report

Merging #15755 into feature will increase coverage by 0.04%.
The diff coverage is n/a.

Impacted file tree graph

@@             Coverage Diff             @@
##           feature   #15755      +/-   ##
===========================================
+ Coverage    95.04%   95.09%   +0.04%     
===========================================
  Files          250      250              
  Lines         6665     6647      -18     
  Branches      1947     1943       -4     
===========================================
- Hits          6335     6321      -14     
+ Misses         329      325       -4     
  Partials         1        1
Impacted Files Coverage Δ
components/card/index.tsx 100% <ø> (+1.36%) ⬆️
components/_util/wave.tsx 88.46% <0%> (+2.88%) ⬆️

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 c91d7d1...47fc829. Read the comment docs.

@zombieJ zombieJ changed the base branch from master to feature Mar 30, 2019

@netlify

This comment has been minimized.

Copy link

commented Mar 30, 2019

Deploy preview for ant-design ready!

Built with commit 47fc829

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

@@ -504,6 +503,12 @@
@pagination-font-weight-active: 500;
@pagination-item-bg-active: transparent;

// PageHeader
// ---
@page-header-padding-horizontal: 24px;

This comment has been minimized.

Copy link
@afc163

afc163 Mar 30, 2019

Member

改成 @card-padding-base?

This comment has been minimized.

Copy link
@zombieJ

zombieJ Mar 30, 2019

Author Member

这边 padding 横竖 padding 不一样,参考的 @input-padding-horizontal & vertical 做的区分。

// ---
@page-header-padding-horizontal: 24px;
@page-header-padding-vertical: 16px;
@page-header-padding-vertical-lg: 20px;

This comment has been minimized.

Copy link
@afc163

afc163 Mar 30, 2019

Member

为啥不是 8 的倍数?

This comment has been minimized.

Copy link
@zombieJ

zombieJ Mar 30, 2019

Author Member

使用 footer 时会变成 20px,我再看一下设计稿确认确认。

This comment has been minimized.

Copy link
@zombieJ

zombieJ Mar 30, 2019

Author Member

和设计师确认过了,的确是 20px

This comment has been minimized.

Copy link
@afc163

afc163 Mar 30, 2019

Member

问题来了,为啥设计师不用 8 的倍数?

#13637 (comment)

This comment has been minimized.

Copy link
@zombieJ

zombieJ Mar 30, 2019

Author Member

之前问过设计师,8n 的 n 可以是 0.5。所以理论上我们的尺寸应该是 主 8n 次 4n 😈

This comment has been minimized.

Copy link
@afc163

afc163 Mar 30, 2019

Member

图片

这个规则太奇怪了,组件最好是无脑组装式的。

This comment has been minimized.

Copy link
@afc163

afc163 Mar 30, 2019

Member

这样可能造成,两个页面(一个 PageHeader 有 footer 一个没有)切换时,上下 padding 变化时造成标题区域的 4px 抖动。

This comment has been minimized.

Copy link
@zombieJ

zombieJ Mar 30, 2019

Author Member

20px 是为了从视觉上拉开距离,不过我觉得这也有道理。先统一成 16px 看看效果好了。

@zombieJ

This comment has been minimized.

Copy link
Member Author

commented Mar 31, 2019

https://deploy-preview-15755--ant-design.netlify.com/components/page-header-cn/#header
我觉得可以的,统一 16px 好了。

@afc163

@afc163

afc163 approved these changes Mar 31, 2019

@zombieJ zombieJ merged commit 0fd0faa into feature Mar 31, 2019

28 of 30 checks passed

Header rules No header rules processed
Details
Pages changed 13 new files uploaded
Details
Auto Assign Auto Assign
Details
Codacy/PR Quality Review Up to standards. A positive pull request.
Details
LGTM analysis: JavaScript No new or fixed alerts
Details
License Compliance All checks passed.
Details
Mixed content No mixed content detected
Details
Redirect rules 18 redirect rules processed
Details
WIP Ready for review
Details
ant-design.ant-design #ant design succeeded
Details
buildsize No change
Details
ci/circleci: compile Your tests passed on CircleCI!
Details
ci/circleci: dist Your tests passed on CircleCI!
Details
ci/circleci: lint Your tests passed on CircleCI!
Details
ci/circleci: setup Your tests passed on CircleCI!
Details
ci/circleci: test_dist Your tests passed on CircleCI!
Details
ci/circleci: test_dist_15 Your tests passed on CircleCI!
Details
ci/circleci: test_dom Your tests passed on CircleCI!
Details
ci/circleci: test_dom_15 Your tests passed on CircleCI!
Details
ci/circleci: test_es Your tests passed on CircleCI!
Details
ci/circleci: test_es_15 Your tests passed on CircleCI!
Details
ci/circleci: test_lib Your tests passed on CircleCI!
Details
ci/circleci: test_lib_15 Your tests passed on CircleCI!
Details
ci/circleci: test_node Your tests passed on CircleCI!
Details
ci/circleci: test_node_15 Your tests passed on CircleCI!
Details
codebeat Target branch is not tracked
Details
codecov/patch Coverage not affected when comparing c91d7d1...47fc829
Details
codecov/project 95.09% (+0.04%) compared to c91d7d1
Details
deploy/netlify Deploy preview ready!
Details
security/snyk - package.json (paranoidjk) No manifest changes detected

@delete-merged-branch delete-merged-branch bot deleted the styled branch Mar 31, 2019

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.