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

enhance Responsive Grid when resolution greater than 1600px #4796

Merged
merged 1 commit into from
Feb 13, 2017
Merged

enhance Responsive Grid when resolution greater than 1600px #4796

merged 1 commit into from
Feb 13, 2017

Conversation

hjin-me
Copy link

@hjin-me hjin-me commented Feb 8, 2017

Close: #4780

为 Grid 的 Col 增加屏幕分辨率大于 1600px 的适配策略,修改变更如下

  • 为 Col 增加 xl 属性
  • 增加 -xl 的 css 选择器及对应 media query 策略

PS.
顺带修改了几个未被使用的 less 变量的赋值错误

目前仅修改了代码部分。文档部分尚未修改。

@mention-bot
Copy link

@hjin-me, thanks for your PR! By analyzing the history of the files in this pull request, we identified @afc163, @benjycui and @pizn to be potential reviewers.

@coveralls
Copy link

Coverage Status

Coverage remained the same at 81.729% when pulling 962083a4c3bb24cac3480a7eceb53098d718bd43 on hjin-me:feature-2.8 into 766cded on ant-design:feature-2.8.

@afc163
Copy link
Member

afc163 commented Feb 8, 2017

文档大概有这么几处:

  1. components/grid/demo/reponsive-more.md xs sm md lg 四个属性后面加一个 xl
  2. components/grid/demo/reponsive-more.md xs sm md lg 四个属性后面加一个 xl
  3. index.zh-CN.md 和 index.en-US.md 的 API 部分。

你可能需要 rebase 一下 feature-2.8,之前英文文档里缺少了响应式的属性。5b14b4f

@coveralls
Copy link

Coverage Status

Coverage remained the same at 81.729% when pulling 315b2ebc371c39ef7104c205c424a84cb5502ab5 on hjin-me:feature-2.8 into 766cded on ant-design:feature-2.8.

@hjin-me
Copy link
Author

hjin-me commented Feb 8, 2017

刚才修改文档的 .md 之后,ci 报错了。
文档部分是否也有对应的单元测试需要修改?

@afc163
Copy link
Member

afc163 commented Feb 8, 2017

文档是没有测试的,现在貌似好了?

@hjin-me
Copy link
Author

hjin-me commented Feb 8, 2017

https://travis-ci.org/ant-design/ant-design/builds/199514551

你看这个。我在 reponsive.md 增加了一个 xl 的,然后报错了。

似乎还要修改 demo.test.js.snap 的内容。

@afc163
Copy link
Member

afc163 commented Feb 8, 2017

哦对,demo 代码是有快照测试的。你本地跑一下 npm test -- -u 更新一下 snap 文件一起提交上来即可。

@coveralls
Copy link

Coverage Status

Coverage remained the same at 82.866% when pulling 0fa02d9 on hjin-me:feature-2.8 into 5b14b4f on ant-design:feature-2.8.

@hjin-me
Copy link
Author

hjin-me commented Feb 9, 2017

文档更改了。rebase 也弄好了。

不过 参照 Bootstrap 的响应式设计... 这段话只加了 xl,没改描述。英文太烂。

Copy link
Member

@afc163 afc163 left a comment

Choose a reason for hiding this comment

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

👍

@benjycui benjycui merged commit c670ff2 into ant-design:feature-2.8 Feb 13, 2017
@hjin-me hjin-me deleted the feature-2.8 branch February 14, 2017 02:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants