From 04f747770eea6006743715cfb919f4fe926ee4cd Mon Sep 17 00:00:00 2001 From: afc163 Date: Fri, 18 Mar 2016 11:48:06 +0800 Subject: [PATCH 01/17] fix(docs), confirm demo & docs --- components/modal/demo/info.md | 9 +++++++-- components/modal/index.md | 3 ++- style/components/confirm.less | 1 + 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/components/modal/demo/info.md b/components/modal/demo/info.md index 4a9eba35b1..a559b04646 100644 --- a/components/modal/demo/info.md +++ b/components/modal/demo/info.md @@ -12,8 +12,13 @@ import { Modal, Button } from 'antd'; function info() { Modal.info({ title: '这是一条通知信息', - content: '一些附加信息一些附加信息一些附加信息', - onOk() {} + content: ( +
+

一些附加信息一些附加信息一些附加信息

+

一些附加信息一些附加信息一些附加信息

+
+ ), + onOk() {}, }); } diff --git a/components/modal/index.md b/components/modal/index.md index 875f4e46d5..efeab06d36 100644 --- a/components/modal/index.md +++ b/components/modal/index.md @@ -31,7 +31,7 @@ | okText | 确认按钮文字 | String | 确定 | | cancelText | 取消按钮文字 | String | 取消 | | maskClosable | 点击蒙层是否允许关闭 | Boolean | true | -| align | 浮层自定义位置 | Object, [dom-align](https://github.com/yiminghe/dom-align) | 距离顶部 100px | +| align | 浮层自定义位置 | Object, [dom-align](https://github.com/yiminghe/dom-align) | 距离顶部 100px | ### Modal.xxx() @@ -47,6 +47,7 @@ | 参数 | 说明 | 类型 | 默认值 | |------------|----------------|------------------|--------------| | title | 标题 | React.Element or String | 无 | +| content | 内容 | React.Element or String | 无 | | onOk | 点击确定回调，参数为关闭函数，返回 promise 时 resolve 后自动关闭 | function | 无 | | onCancel | 取消回调，参数为关闭函数，返回 promise 时 resolve 后自动关闭 | function | 无 | | width | 宽度 | String or Number | 416 | diff --git a/style/components/confirm.less b/style/components/confirm.less index 19164b0378..9e98fcb725 100644 --- a/style/components/confirm.less +++ b/style/components/confirm.less @@ -21,6 +21,7 @@ margin-left: 37px; font-size: @font-size-base; color: @text-color; + margin-top: 8px; } .anticon { From 1b5bff51dd80464284580386c0d56dd1a7653719 Mon Sep 17 00:00:00 2001 From: afc163 Date: Fri, 18 Mar 2016 15:15:31 +0800 Subject: [PATCH 02/17] update resource files --- docs/resource/download.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/resource/download.md b/docs/resource/download.md index 1d17a2f27d..43305127dd 100644 --- a/docs/resource/download.md +++ b/docs/resource/download.md @@ -8,17 +8,17 @@ 这里提供 Ant Design 相关设计资源和设计工具的下载，更多设计资源正在整理和完善中。
- + - Axure Components + Axure Components v1.3 一套强大的 Ant Design 的 Axure 部件库 - + - Axure Box + Axure Box v1.3 强大的 Ant Design 组件拼装方式 From adb64f1fe46c47decad79ae28a768e1d4ffcfed2 Mon Sep 17 00:00:00 2001 From: afc163 Date: Fri, 18 Mar 2016 15:17:34 +0800 Subject: [PATCH 03/17] update resource files --- docs/resource/download.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/resource/download.md b/docs/resource/download.md index 43305127dd..40e44acab3 100644 --- a/docs/resource/download.md +++ b/docs/resource/download.md @@ -29,7 +29,7 @@ 一套页面逻辑原型库，帮你梳理页面逻辑 - + Web Font From d597a6d63188cb2c19443185b43db96732f92044 Mon Sep 17 00:00:00 2001 From: afc163 Date: Fri, 18 Mar 2016 15:19:42 +0800 Subject: [PATCH 04/17] update deploy log --- webpack.deploy.config.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/webpack.deploy.config.js b/webpack.deploy.config.js index 0118df97cc..5f281b448c 100644 --- a/webpack.deploy.config.js +++ b/webpack.deploy.config.js @@ -8,6 +8,9 @@ config.plugins = [config.plugins[0], new webpack.optimize.UglifyJsPlugin({ sourceMap: false, output: { ascii_only: true + }, + compress: { + warnings: false } })]; From e1c2e3f1a35e3c66f95e804fecec9610ddf39ad0 Mon Sep 17 00:00:00 2001 From: afc163 Date: Fri, 18 Mar 2016 16:23:05 +0800 Subject: [PATCH 05/17] bump 0.12.12 --- CHANGELOG.md | 8 ++++++++ package.json | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 85ce26fd92..55cc72cd25 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,14 @@ --- +## 0.12.12 + +`2016-03-18` + +- [设计资源](http://ant.design/docs/resource/download)文件更新。 +- 修复 Popover 和 Popconfirm 箭头消失的问题。 +- 修复一个 Table 切换分页长度时的页码溢出的问题。 + ## 0.12.11 `2016-03-16` diff --git a/package.json b/package.json index 277b54be43..1c8ecacd5e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "antd", - "version": "0.12.11", + "version": "0.12.12", "title": "Ant Design", "description": "一个 UI 设计语言", "homepage": "http://ant.design/", From 9a937100e869dabf9be6c34ca5d63c6a99873b6a Mon Sep 17 00:00:00 2001 From: afc163 Date: Sat, 19 Mar 2016 01:54:46 +0800 Subject: [PATCH 06/17] fix(docs): close #1230 --- docs/pattern/navigation.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/pattern/navigation.md b/docs/pattern/navigation.md index 4367d24822..71f2250eff 100644 --- a/docs/pattern/navigation.md +++ b/docs/pattern/navigation.md @@ -31,8 +31,8 @@ 总结 - 一般适用在浏览性强、门户性质的网站，以及一些比较前台化的应用。 适用在操作性强、中后台管理性质的应用。 + 一般适用在浏览性强、门户性质的网站，以及一些比较前台化的应用。 From 77783d8c9bf0c0c0d80158f91c32f2a3225754c7 Mon Sep 17 00:00:00 2001 From: afc163 Date: Sat, 19 Mar 2016 13:54:38 +0800 Subject: [PATCH 07/17] rollback for es3ify, #858 --- docs/react/getting-started.md | 7 ++++++- webpack.config.js | 4 ++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/docs/react/getting-started.md b/docs/react/getting-started.md index 6dec916da8..992bb51367 100644 --- a/docs/react/getting-started.md +++ b/docs/react/getting-started.md @@ -102,12 +102,13 @@ Ant Design React 支持所有的现代浏览器和 IE8+。 @@ -130,6 +131,10 @@ Ant Design React 支持所有的现代浏览器和 IE8+。 ``` +另外，由于 `babel@6.x` 对 IE8 的支持不佳，你可能会遇到类似 [#28](https://github.com/ant-tool/atool-build/issues/28) 和 [#858](https://github.com/ant-design/ant-design/issues/858) 的 default 报错的问题。 + +[antd-init](http://github.com/ant-design/antd-init) 脚手架已经解决了这个问题，你也可以参照这个 [webpack 配置](https://github.com/ant-design/antd-init/blob/f5fb9479ca973fade51fd6754e50f8b3fafbb1df/boilerplate/webpack.config.js#L4-L8)。 + > 更多 IE8 下使用 React 的相关问题可以参考：https://github.com/xcatliu/react-ie8 ## 自行构建 diff --git a/webpack.config.js b/webpack.config.js index ef21c5af4e..cdf3aebe04 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -27,6 +27,10 @@ module.exports = { module: { loaders: [{ + test: /\.jsx?$/, + exclude: /node_modules/, + loader: 'es3ify' + }, { test: /\.jsx?$/, exclude: /node_modules/, loader: 'babel', From e5a014d3a642f4654791120b4dcdcef50c94bfe8 Mon Sep 17 00:00:00 2001 From: afc163 Date: Sat, 19 Mar 2016 15:28:48 +0800 Subject: [PATCH 08/17] Fix combobox select error style, close #1227 --- style/components/form.less | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/style/components/form.less b/style/components/form.less index ce0c7c73ca..0e7d4ad6f3 100644 --- a/style/components/form.less +++ b/style/components/form.less @@ -391,6 +391,10 @@ form { } } + .@{select-prefix-cls}-combobox .@{select-prefix-cls}-search__field:focus { + box-shadow: none; + } + // ant-datepicker .@{calendar-prefix-cls}-picker-icon:after { color: @error-color; From 959a190d3ac81a10b66979ec572c78baaf5d4987 Mon Sep 17 00:00:00 2001 From: afc163 Date: Sun, 20 Mar 2016 16:25:14 +0800 Subject: [PATCH 09/17] update layout --- site/templates/layout.html | 4 ++-- webpack.config.js | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/site/templates/layout.html b/site/templates/layout.html index 1629b3cb0d..2b8a86f7cf 100644 --- a/site/templates/layout.html +++ b/site/templates/layout.html @@ -12,7 +12,7 @@ {% block styles %}{% endblock %} - + - + {% block scripts %}{% endblock %} diff --git a/webpack.config.js b/webpack.config.js index cdf3aebe04..c1d081a166 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -67,5 +67,5 @@ module.exports = { new webpack.NoErrorsPlugin() ], - devtool: 'source-map' + devtool: 'cheap-module-source-map' }; From 7bf88306ff14c6c200cdcfccf82a0dcaf3d1a793 Mon Sep 17 00:00:00 2001 From: afc163 Date: Mon, 21 Mar 2016 18:14:05 +0800 Subject: [PATCH 10/17] fix form demo --- components/form/demo/form-controls.md | 48 +++++++++++++-------------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/components/form/demo/form-controls.md b/components/form/demo/form-controls.md index d616e0ede6..0a643d9725 100644 --- a/components/form/demo/form-controls.md +++ b/components/form/demo/form-controls.md @@ -53,42 +53,42 @@ ReactDOM.render( label="Checkbox 多选框：" labelCol={{ span: 6 }} wrapperCol={{ span: 18 }} > - - - + + + - - - + + + - - A - B - C - D - + + A + B + C + D + , mountNode); From 5b1005e2430a0dc972df549acdcb8796033b1e9e Mon Sep 17 00:00:00 2001 From: afc163 Date: Mon, 21 Mar 2016 18:53:57 +0800 Subject: [PATCH 11/17] improve radio animation --- style/components/radio.less | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/style/components/radio.less b/style/components/radio.less index d90e3aa81f..7dc3a9f686 100644 --- a/style/components/radio.less +++ b/style/components/radio.less @@ -1,7 +1,7 @@ @radio-group-prefix-cls: ant-radio-group; @radio-prefix-cls: ant-radio; @radio-inner-prefix-cls: ~"@{radio-prefix-cls}-inner"; -@radio-duration: .3s; +@radio-duration: .2s; .@{radio-group-prefix-cls} { display: inline-block; @@ -38,7 +38,8 @@ content: ' '; background-color: @primary-color; opacity: 0; - transition: transform @radio-duration @ease-in-out-circ, opacity @radio-duration @ease-in-out-circ, background-color @radio-duration @ease-in-out-circ; + transform: scale(0); + transition: all @radio-duration @ease-in-out-circ; } position: relative; @@ -52,7 +53,7 @@ border-radius: 14px; border-color: @border-color-base; background-color: #fff; - transition: border-color @radio-duration @ease-in-out-circ, background-color @radio-duration @ease-in-out-circ; + transition: all @radio-duration @ease-in-out-circ; } &-input { @@ -74,7 +75,7 @@ &:after { transform: scale(1); opacity: 1; - transition: transform @radio-duration @ease-out-back, opacity @radio-duration @ease-in-out-circ, background-color @radio-duration @ease-in-out-circ; + transition: all @radio-duration @ease-in-out-circ; } } } From 8fa7f9aec429b2a960c27a5e4ddcd84107e4bef9 Mon Sep 17 00:00:00 2001 From: afc163 Date: Tue, 22 Mar 2016 00:22:35 +0800 Subject: [PATCH 12/17] update docs --- docs/react/getting-started.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/react/getting-started.md b/docs/react/getting-started.md index 992bb51367..a69377929b 100644 --- a/docs/react/getting-started.md +++ b/docs/react/getting-started.md @@ -141,6 +141,8 @@ Ant Design React 支持所有的现代浏览器和 IE8+。 如果想自己维护工作流，我们推荐使用 [webpack](http://webpack.github.io/) 进行构建和调试。理论上你可以利用 React 生态圈中的 [各种脚手架](https://github.com/enaqx/awesome-react#boilerplates) 进行开发，如果遇到问题可参考我们所使用的 [webpack 配置](https://github.com/ant-tool/atool-build/blob/master/src/getWebpackCommonConfig.js) 进行 [定制](http://ant-tool.github.io/webpack-config.htm)。 +目前社区也有很多基于 antd 定制的[脚手架](https://github.com/ant-design/ant-design/issues/129)，欢迎进行试用和贡献。 + ### 改变主色系 - [配置代码示例](https://github.com/ant-design/antd-init/tree/master/examples/customize-antd-theme) From 54a878873c9f6cf2640ce79d58e4869e2ce6f666 Mon Sep 17 00:00:00 2001 From: afc163 Date: Tue, 22 Mar 2016 00:26:33 +0800 Subject: [PATCH 13/17] fix whitespace --- docs/react/getting-started.md | 2 +- docs/react/introduce.md | 2 +- docs/spec/introduce.md | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/react/getting-started.md b/docs/react/getting-started.md index a69377929b..c17731410f 100644 --- a/docs/react/getting-started.md +++ b/docs/react/getting-started.md @@ -141,7 +141,7 @@ Ant Design React 支持所有的现代浏览器和 IE8+。 如果想自己维护工作流，我们推荐使用 [webpack](http://webpack.github.io/) 进行构建和调试。理论上你可以利用 React 生态圈中的 [各种脚手架](https://github.com/enaqx/awesome-react#boilerplates) 进行开发，如果遇到问题可参考我们所使用的 [webpack 配置](https://github.com/ant-tool/atool-build/blob/master/src/getWebpackCommonConfig.js) 进行 [定制](http://ant-tool.github.io/webpack-config.htm)。 -目前社区也有很多基于 antd 定制的[脚手架](https://github.com/ant-design/ant-design/issues/129)，欢迎进行试用和贡献。 +目前社区也有很多基于 antd 定制的 [脚手架](https://github.com/ant-design/ant-design/issues/129)，欢迎进行试用和贡献。 ### 改变主色系 diff --git a/docs/react/introduce.md b/docs/react/introduce.md index 4360c5f993..14561eac24 100644 --- a/docs/react/introduce.md +++ b/docs/react/introduce.md @@ -86,4 +86,4 @@ import 'antd/lib/index.css'; // or 'antd/style/index.less' ## 如何贡献 -在任何形式的参与前，请先阅读 [贡献者文档](https://github.com/ant-design/ant-design/blob/master/.github/CONTRIBUTING.md)。有任何建议或意见您可以 [Pull Request](https://github.com/ant-design/ant-design/pulls)，给我们 [报告 Bug](http://dwz.cn/2AF9ao) 或 [提问](https://github.com/ant-design/ant-design/issues)。 +在任何形式的参与前，请先阅读 [贡献者文档](https://github.com/ant-design/ant-design/blob/master/.github/CONTRIBUTING.md)。有任何建议或意见您可以 [Pull Request](https://github.com/ant-design/ant-design/pulls)，给我们 [报告 Bug](http://dwz.cn/2AF9ao) 或 [提问](https://github.com/ant-design/ant-design/issues)。 diff --git a/docs/spec/introduce.md b/docs/spec/introduce.md index d324f45cd4..e1546d7a35 100644 --- a/docs/spec/introduce.md +++ b/docs/spec/introduce.md @@ -32,4 +32,4 @@ Ant Design 是一个致力于提升『用户』和『设计者』使用体验的 ## 如何贡献 -我们欢迎任何形式的贡献，有任何建议或意见您可以进行 [Pull Request](https://github.com/ant-design/ant-design/pulls)，或者给我们[提问](https://github.com/ant-design/ant-design/issues)。 +我们欢迎任何形式的贡献，有任何建议或意见您可以进行 [Pull Request](https://github.com/ant-design/ant-design/pulls)，或者给我们 [提问](https://github.com/ant-design/ant-design/issues)。 From 1e2576aeba8aa0f2f6978afa0c5bef3313d15413 Mon Sep 17 00:00:00 2001 From: afc163 Date: Tue, 22 Mar 2016 00:28:51 +0800 Subject: [PATCH 14/17] Add antd-ember --- docs/spec/introduce.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/spec/introduce.md b/docs/spec/introduce.md index e1546d7a35..455db6cd35 100644 --- a/docs/spec/introduce.md +++ b/docs/spec/introduce.md @@ -29,6 +29,7 @@ Ant Design 是一个致力于提升『用户』和『设计者』使用体验的 - [Ant Design of React](/docs/react/introduce)（官方实现） - [vue-antd](https://github.com/okoala/vue-antd) +- [antd-ember](https://github.com/idcos/antd-ember) ## 如何贡献 From aaeb925de1f80b2439e28c538c5efb7b0e9d8089 Mon Sep 17 00:00:00 2001 From: afc163 Date: Tue, 22 Mar 2016 16:21:23 +0800 Subject: [PATCH 15/17] fix(cascader): can not scroll menu in Chrome 49 --- style/components/cascader.less | 1 - 1 file changed, 1 deletion(-) diff --git a/style/components/cascader.less b/style/components/cascader.less index 584e1164b0..f02ed13c27 100644 --- a/style/components/cascader.less +++ b/style/components/cascader.less @@ -65,7 +65,6 @@ } &-menus { font-size: 12px; - overflow: hidden; background: #fff; position: absolute; border: 1px solid @border-color-base; From e4c355f6a4a6d8d901091c649fee19d1026c688a Mon Sep 17 00:00:00 2001 From: afc163 Date: Tue, 22 Mar 2016 16:42:18 +0800 Subject: [PATCH 16/17] fix cascader height --- style/components/cascader.less | 1 - 1 file changed, 1 deletion(-) diff --git a/style/components/cascader.less b/style/components/cascader.less index f02ed13c27..7981521e76 100644 --- a/style/components/cascader.less +++ b/style/components/cascader.less @@ -71,7 +71,6 @@ border-radius: @border-radius-base; box-shadow: @box-shadow-base; white-space: nowrap; - height: 180px; &-empty, &-hidden { display: none; From 02807a69ad51a8d7658409ad857459424bbc05f1 Mon Sep 17 00:00:00 2001 From: afc163 Date: Tue, 22 Mar 2016 19:24:47 +0800 Subject: [PATCH 17/17] update some basic style --- site/static/style.less | 1 + style/components/menu.less | 1 - style/core/base.less | 9 +++++++++ 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/site/static/style.less b/site/static/style.less index 4479f40205..4004406ee2 100644 --- a/site/static/style.less +++ b/site/static/style.less @@ -59,6 +59,7 @@ a:hover { background: #2db7f5; color: #fff; } + ::-moz-selection { background: #2db7f5; color: #fff; diff --git a/style/components/menu.less b/style/components/menu.less index 95c05cad64..36bd114d5b 100644 --- a/style/components/menu.less +++ b/style/components/menu.less @@ -29,7 +29,6 @@ } &-item, - &-submenu, &-submenu-title { cursor: pointer; transition: all 0.3s ease; diff --git a/style/core/base.less b/style/core/base.less index 8cb73a4fbd..977ceb302a 100644 --- a/style/core/base.less +++ b/style/core/base.less @@ -46,6 +46,14 @@ input::-ms-clear, input::-ms-reveal { display: none; } +::selection { + background: @primary-color; +} + +::-moz-selection { + background: @primary-color; +} + // Links // -- TODO -- a { @@ -54,6 +62,7 @@ a { text-decoration: none; outline: none; cursor: pointer; + transition: color .3s ease; &:hover { color: @link-hover-color;