From 9e2d1be3d6b373e9127ebbb56418aff792f59e5f Mon Sep 17 00:00:00 2001 From: Guan Hao Date: Thu, 14 Jan 2016 11:08:57 +0800 Subject: [PATCH 1/7] fix typo in layout demo code --- docs/spec/layout/demo/aside.md | 2 +- docs/spec/layout/demo/top.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/spec/layout/demo/aside.md b/docs/spec/layout/demo/aside.md index 06764f0ad2..302d52e856 100644 --- a/docs/spec/layout/demo/aside.md +++ b/docs/spec/layout/demo/aside.md @@ -115,7 +115,7 @@ ReactDOM.render( } .ant-layout-aside .ant-layout-footer { - height; 64px; + height: 64px; line-height: 64px; text-align: center; font-size: 12px; diff --git a/docs/spec/layout/demo/top.md b/docs/spec/layout/demo/top.md index a2d6163b48..d31adb56b6 100644 --- a/docs/spec/layout/demo/top.md +++ b/docs/spec/layout/demo/top.md @@ -99,7 +99,7 @@ ReactDOM.render( } .ant-layout-top .ant-layout-footer { - height; 64px; + height: 64px; line-height: 64px; text-align: center; font-size: 12px; From 56a0baddede28960a2a0284c54b943f9c3821dba Mon Sep 17 00:00:00 2001 From: afc163 Date: Thu, 14 Jan 2016 11:08:25 +0800 Subject: [PATCH 2/7] fix links --- README-zh_CN.md | 2 +- README.md | 2 +- docs/spec/introduce.md | 2 +- site/templates/home.html | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README-zh_CN.md b/README-zh_CN.md index 4a7679bf9e..a964b6d968 100644 --- a/README-zh_CN.md +++ b/README-zh_CN.md @@ -44,7 +44,7 @@ import 'antd/lib/index.css'; // or 'antd/style/index.less' ## 链接 - [首页](http://ant.design/) -- [React UI 库](http://ant.design/docs/introduce) +- [React UI 库](http://ant.design/docs/react/introduce) - [修改记录](CHANGELOG.md) - [开发脚手架](https://github.com/ant-design/antd-init/) - [本地调试工具集](https://github.com/dora-js/dora/) diff --git a/README.md b/README.md index 6138edae90..d6205b3428 100644 --- a/README.md +++ b/README.md @@ -44,7 +44,7 @@ Normal browsers and Internet Explorer 8+. ## Links - [Home page](http://ant.design/) -- [React UI library](http://ant.design/docs/introduce) +- [React UI library](http://ant.design/docs/react/introduce) - [ChangeLog](CHANGELOG.md) - [Scaffold tool](https://github.com/ant-design/antd-init/) - [Debug tools set](https://github.com/dora-js/dora) diff --git a/docs/spec/introduce.md b/docs/spec/introduce.md index 6122120c0c..7eeb1c3905 100644 --- a/docs/spec/introduce.md +++ b/docs/spec/introduce.md @@ -24,7 +24,7 @@ Ant Design 源自蚂蚁金服体验技术部的后台产品开发，我们的设 我们采用 [React](http://facebook.github.io/react/) 封装了一套 Ant Design 的组件库，也欢迎社区其他框架的实现版本。 -- [Ant Design of React](/docs/introduce)（官方实现） +- [Ant Design of React](/docs/react/introduce)（官方实现） - [vue-antd](https://github.com/okoala/vue-antd) ## 如何贡献 diff --git a/site/templates/home.html b/site/templates/home.html index 56168554e4..9e4a63d9b6 100644 --- a/site/templates/home.html +++ b/site/templates/home.html @@ -55,7 +55,7 @@ position: relative; height: 100%; width: 100%; - background: url("https://t.alipayobjects.com/images/T1OhFkXfpgXXXXXXXX.png") no-repeat center / cover; + background: url("https://os.alipayobjects.com/rmsportal/GhjqstwSgxBXrZS.png") no-repeat center / cover; } .banner-text-wrapper { From 11353c7a60a187684b28d54e32ffb677183f8a94 Mon Sep 17 00:00:00 2001 From: afc163 Date: Thu, 14 Jan 2016 11:54:46 +0800 Subject: [PATCH 3/7] reset menu link color, fix #872 --- components/menu/demo/sider.md | 2 +- style/components/menu.less | 10 +++++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/components/menu/demo/sider.md b/components/menu/demo/sider.md index c233c76848..c2de994506 100644 --- a/components/menu/demo/sider.md +++ b/components/menu/demo/sider.md @@ -35,7 +35,7 @@ const Sider = React.createClass({ 选项2 - 选项3 + 选项3 选项4 diff --git a/style/components/menu.less b/style/components/menu.less index dae84f1dc7..723d59ec1f 100644 --- a/style/components/menu.less +++ b/style/components/menu.less @@ -35,6 +35,14 @@ transition: all 0.3s ease; } + &-item > a { + display: block; + color: @text-color; + &:hover { + color: @text-color; + } + } + &-item-active, &-submenu-title:hover { background-color: tint(@primary-color, 90%); @@ -58,7 +66,7 @@ &-vertical { border-right: 1px solid #e9e9e9; .@{menu-prefix-cls}-item { - border-right: 2px solid transparent; + border-right: 1px solid #e9e9e9; margin-left: -1px; left: 1px; position: relative; From f1ff04a1ceaed74e47fc551e872d7cd7248dd406 Mon Sep 17 00:00:00 2001 From: afc163 Date: Thu, 14 Jan 2016 13:59:12 +0800 Subject: [PATCH 4/7] Docs: fix markdown and remove console --- docs/practice/cases.md | 1 - site/static/style.css | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/docs/practice/cases.md b/docs/practice/cases.md index bdb1086f6d..c3aaa35fe7 100644 --- a/docs/practice/cases.md +++ b/docs/practice/cases.md @@ -107,7 +107,6 @@ AntV 将数据图形小组近几年在探索数据可视化过程中取得的成 }; img.src = url; setTimeout(function() { - console.log('timeout'); finish('timeout'); }, 1500); } diff --git a/site/static/style.css b/site/static/style.css index 518624b9f5..782219855f 100644 --- a/site/static/style.css +++ b/site/static/style.css @@ -548,7 +548,7 @@ footer ul li > a { width: 80%; } -.markdown ul li { +.markdown ul > li { list-style: circle; } @@ -563,7 +563,7 @@ footer ul li > a { margin: 0.6em 0; } -.markdown ol li { +.markdown ol > li { list-style: decimal; } From f22eeb179b9d045763592350307ccf0812c8a812 Mon Sep 17 00:00:00 2001 From: afc163 Date: Thu, 14 Jan 2016 14:19:12 +0800 Subject: [PATCH 5/7] update resource link --- 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 46412e8688..4516547c2f 100644 --- a/docs/resource/download.md +++ b/docs/resource/download.md @@ -14,7 +14,7 @@ 一套强大的 Ant Design 的 Axure 部件库 - + Axure Box From 1405600919f7a4c8dab4c43888c809f0d43cad69 Mon Sep 17 00:00:00 2001 From: afc163 Date: Thu, 14 Jan 2016 14:29:30 +0800 Subject: [PATCH 6/7] Add IE8 issues link --- README-zh_CN.md | 2 ++ README.md | 1 + docs/react/introduce.md | 2 ++ 3 files changed, 5 insertions(+) diff --git a/README-zh_CN.md b/README-zh_CN.md index a964b6d968..186ce4a121 100644 --- a/README-zh_CN.md +++ b/README-zh_CN.md @@ -41,6 +41,8 @@ import 'antd/lib/index.css'; // or 'antd/style/index.less' 现代浏览器和 IE8 及以上。 +> [IE8 issues](https://github.com/xcatliu/react-ie8) + ## 链接 - [首页](http://ant.design/) diff --git a/README.md b/README.md index d6205b3428..c5d5699b4d 100644 --- a/README.md +++ b/README.md @@ -40,6 +40,7 @@ Use components on demand by writing as `import DatePicker from 'antd/lib/date-pi Normal browsers and Internet Explorer 8+. +> [IE8 issues](https://github.com/xcatliu/react-ie8) ## Links diff --git a/docs/react/introduce.md b/docs/react/introduce.md index 8e7dcbfc37..56759c61c5 100644 --- a/docs/react/introduce.md +++ b/docs/react/introduce.md @@ -57,6 +57,8 @@ import 'antd/lib/index.css'; // or 'antd/style/index.less' 现代浏览器和 IE8 及以上。 +> [IE8 issues](https://github.com/xcatliu/react-ie8) + ## 链接 - [首页](http://ant.design/) From 413e816c98f16bba420fd5a93e9996dcd4c50ba3 Mon Sep 17 00:00:00 2001 From: afc163 Date: Thu, 14 Jan 2016 15:24:54 +0800 Subject: [PATCH 7/7] update button doc --- components/button/index.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/components/button/index.md b/components/button/index.md index 380a648be5..d869c820b7 100644 --- a/components/button/index.md +++ b/components/button/index.md @@ -21,12 +21,12 @@ 属性 | 说明 | 类型 | 默认值 -----|-----|-----|------ -type | 设置按钮类型，可选值为 `primary` `ghost` 或者不设 | Enum | undefined -htmlType | 设置 `button` 原生的 `type` 值，可选值请参考 HTML标准 | Enum | `button` -shape | 设置按钮形状，可选值为 `circle` `circle-outline` 或者不设 | Enum | undefined -size | 设置按钮大小，可选值为 `small` `large` 或者不设 | Enum | undefined -loading | 设置按钮载入状态，存在为 `true`，不存在为 `false`，或直接设置值，如：`loading="true"` | Bool | false -onClick | `click` 事件的 handler | Function | `function() {}` +type | 设置按钮类型，可选值为 `primary` `ghost` 或者不设 | string | - +htmlType | 设置 `button` 原生的 `type` 值，可选值请参考 HTML标准 | string | `button` +shape | 设置按钮形状，可选值为 `circle` `circle-outline` 或者不设 | string | 无 +size | 设置按钮大小，可选值为 `small` `large` 或者不设 | string | `default` +loading | 设置按钮载入状态 | boolean | false +onClick | `click` 事件的 handler | function | `function() {}` - `` 最终会被渲染为 ``，并且除了上表中的属性，其它属性都会直接传到 ``