diff --git a/CHANGELOG.md b/CHANGELOG.md index 5d4f9bd04..71a8f693d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,9 @@ --- -## 0.11.2 `2015-01-03` +## 0.11.2 + +`2015-01-03` - 新增了[贡献文档](https://github.com/ant-design/ant-design/blob/master/CONTRIBUTING.md)。 - 修复一个 DatePicker 中选择的国际化文案问题。[#771](https://github.com/ant-design/ant-design/issues/771) @@ -18,14 +20,18 @@ - 修复 `0.11.1`版本对 React 版本要求太严的问题，对应的警告提示对于 `0.14.x` 将不再出现。 - 组件和文档的样式小调整。 -## 0.11.1 `2015-12-29` +## 0.11.1 + +`2015-12-29` - 修复一个 Table 无法修改 pageSize 的问题。 - 修复一个 Table 子表格展开的对齐问题。 - 修复一个 Chrome 下部分图标左侧切边的问题。 - 修复搜索输入框在表单下使用的样式问题。[#762](https://github.com/ant-design/ant-design/issues/762) -## 0.11.0 `2015-12-28` +## 0.11.0 + +`2015-12-28` - **移除默认加载的样式文件，样式现在需要独立加载。** - 按钮圆角调整为 `6px`。 @@ -103,11 +109,15 @@ --- -## 0.10.5 `2016-01-04` +## 0.10.5 + +`2016-01-04` - 修复 Table 更新 dataSource 后，选中项没有置空的问题。[#793](https://github.com/ant-design/ant-design/issues/793) -## 0.10.4 `2015-11-30` +## 0.10.4 + +`2015-11-30` - 将 media-match 加入默认的 polyfill 文件中。[5626974](https://github.com/ant-design/ant-design/commit/562697423b1139eb324c1dceb051c143f4870ed7) - 修复了 [MonthPicker](http://ant.design/components/datepicker/#demo-month-picker) 报错问题，并增加了相关演示。 @@ -115,7 +125,9 @@ - 修复今天是不可选日期时的一个展示问题。[#606](https://github.com/ant-design/ant-design/issues/606) -## 0.10.3 `2015-11-26` +## 0.10.3 + +`2015-11-26` - 和 0.9.x 保持一致默认引入 `antd/lib/index.css`（而非 less 文件），方便第三方引用。引用 less 文件进行变量配置的可自行 `import 'antd/style/index.less'`。[#593](https://github.com/ant-design/ant-design/issues/593) - 升级 Pagination，增加 `defaultCurrent` 属性，修正原来的 `current` 为[完全受控属性](https://facebook.github.io/react/docs/forms.html#controlled-components)。 @@ -123,7 +135,9 @@ - 对演示和样式代码增加了 lint 检查。 -## 0.10.2 `2015-11-25` +## 0.10.2 + +`2015-11-25` - Slider 新增 `tipFormatter` 用于格式化 Tooltip 的内容。 - 优化 Badge 动画效果。 @@ -134,7 +148,9 @@ - InputNumber 同时设置 `size` `className` 时会有冲突。 -## 0.10.1 `2015-11-20` +## 0.10.1 + +`2015-11-20` - 修改内部组件的引用结构，方便工具优化。[#566](https://github.com/ant-design/ant-design/pull/566) - 移除了演示中没有使用过的 `antd.ButtonGroup`，依然用 `const ButtonGroup = Button.Group` 来使用。 @@ -147,7 +163,9 @@ - 修复 Datepicker 的 `style` 和 `calendarStyle` 属性失效的问题，并将 `calendarStyle` 更名为 `popupStyle`。 -## 0.10.0 `2015-11-20` +## 0.10.0 + +`2015-11-20` - 全面兼容 `react@0.14.x`。 - 新增 [时间选择 Timepicker](http://ant.design/components/timepicker/)、[日历 Calendar](http://ant.design/components/calendar/)、[加载中 Spin](http://ant.design/components/spin/) 组件。 @@ -217,12 +235,16 @@ --- -## 0.9.3 ~ 0.9.5 `2015-11-04` +## 0.9.3 ~ 0.9.5 + +`2015-11-04` * 增加对 React 版本的检测提示机制，0.9.x 序列只能使用 `react@~0.13.3`。 -## 0.9.2 `2015-10-26` +## 0.9.2 + +`2015-10-26` * Tooltip 的 title 为空时不展示浮层。[9b53117](https://github.com/ant-design/ant-design/commit/9b5311791e73270c7c16a602ac74dd59719a5f76) * 修复 Upload 文件列表链接的 target 属性。[340a170](https://github.com/ant-design/ant-design/commit/340a1702b6a7b065ac02d417c891e1886dfe470d) @@ -230,7 +252,9 @@ * 修复一些小的样式问题。 -## 0.9.1 `2015-09-26` +## 0.9.1 + +`2015-09-26` * 添加 Pagination pageSize 发生变化的回调。[#317](https://github.com/ant-design/ant-design/issues/317) * 升级依赖 rc-upload 到 1.6.x，修复 IE8/9 下的兼容性问题。 @@ -249,7 +273,9 @@ * 部分组件交互和视觉效果修正。 -## 0.9.0 `2015-09-14` +## 0.9.0 + +`2015-09-14` * 新增 [timeline](components/timeline/) 和 [badge](components/badge/) 组件。 * 优化弹出层类组件的动画效果，使其更加流畅。 @@ -288,7 +314,9 @@ * 支持和 react-router 结合使用。 -## 0.8.0 `2015-08-25` +## 0.8.0 + +`2015-08-25` 这个版本是第一个稳定版，组件经过三期迭代，基本到齐，并有大量改进和变化，不向下兼容。 @@ -300,12 +328,16 @@ * 排查并修复 IE 和 safari 等浏览器的兼容问题。 * 大量代码重构，演示代码补充，文档更新、以及样式上的优化。 -## 0.7.3 `2015-07-30` +## 0.7.3 + +`2015-07-30` * 小幅重构了 Table 分页，修复了分页导致的数据不展示的问题。 * 更新了部分文档。 -## 0.7.2 `2015-07-27` +## 0.7.2 + +`2015-07-27` * 修复本地模式下 pagination 为 false 时数据无法显示的 [问题](https://github.com/ant-design/ant-design/commit/1954586665e59031eae5d2c8b2cdb08f83d64fcb)。 * 重构了 message 组件。 @@ -313,14 +345,18 @@ * 部分代码切换至 ES6 模式。 * 修正了部分组件的样式和演示，优化部分动画。 -## 0.7.1 `2015-07-22` +## 0.7.1 + +`2015-07-22` * 修复了 Table 组件的 pagination 为 false 时分页未消失的 [问题](https://github.com/ant-design/ant-design/commit/01a6c0f1e6707b72a54ef30d073d148a87b391a8)。 * select 组件[选中后默认显示标签内容](https://github.com/ant-design/ant-design/issues/50)（原来是显示 value）。 * 修正了部分组件的样式和演示。 * 打包文件为 [umd 模式](https://github.com/ant-design/ant-design/commit/9b7b940cb417429d8fc57d83e252991b043d0f2f)。 -## 0.7.0 `2015-07-21` +## 0.7.0 + +`2015-07-21` * 第一个公开版本，发布 `layout`、`iconfont`、`button`、`form`、`checkbox`、`radio`、`switch`、`slider`、`input-number`、`datepicker`、`select`、`tabs`、`steps`、`breadcrumb`、`collapse`、`pagination`、`modal`、`message`、`dropdown`、`popover`、`popconfirm`、`tooltip`、`progress`、`table` 等组件。 * 发布 [Ant Design 首页](http://ant.design/) 和入门文档。 diff --git a/pattern/advanced-search.md b/docs/pattern/advanced-search.md similarity index 100% rename from pattern/advanced-search.md rename to docs/pattern/advanced-search.md diff --git a/pattern/complex-table.md b/docs/pattern/complex-table.md similarity index 100% rename from pattern/complex-table.md rename to docs/pattern/complex-table.md diff --git a/pattern/form.md b/docs/pattern/form.md similarity index 100% rename from pattern/form.md rename to docs/pattern/form.md diff --git a/pattern/index.md b/docs/pattern/index.md similarity index 100% rename from pattern/index.md rename to docs/pattern/index.md diff --git a/pattern/list.md b/docs/pattern/list.md similarity index 100% rename from pattern/list.md rename to docs/pattern/list.md diff --git a/pattern/navigation.md b/docs/pattern/navigation.md similarity index 100% rename from pattern/navigation.md rename to docs/pattern/navigation.md diff --git a/pattern/table.md b/docs/pattern/table.md similarity index 100% rename from pattern/table.md rename to docs/pattern/table.md diff --git a/practice/index.md b/docs/practice/index.md similarity index 100% rename from practice/index.md rename to docs/practice/index.md diff --git a/docs/getting-started.md b/docs/react/getting-started.md similarity index 100% rename from docs/getting-started.md rename to docs/react/getting-started.md diff --git a/docs/install.md b/docs/react/install.md similarity index 100% rename from docs/install.md rename to docs/react/install.md diff --git a/docs/install_en.md b/docs/react/install_en.md similarity index 100% rename from docs/install_en.md rename to docs/react/install_en.md diff --git a/docs/introduce.md b/docs/react/introduce.md similarity index 100% rename from docs/introduce.md rename to docs/react/introduce.md diff --git a/docs/upgrade-notes.md b/docs/react/upgrade-notes.md similarity index 100% rename from docs/upgrade-notes.md rename to docs/react/upgrade-notes.md diff --git a/spec/tools.md b/docs/resource/tools.md similarity index 100% rename from spec/tools.md rename to docs/resource/tools.md diff --git a/spec/colors.md b/docs/spec/colors.md similarity index 100% rename from spec/colors.md rename to docs/spec/colors.md diff --git a/spec/easing.md b/docs/spec/easing.md similarity index 100% rename from spec/easing.md rename to docs/spec/easing.md diff --git a/spec/font.md b/docs/spec/font.md similarity index 100% rename from spec/font.md rename to docs/spec/font.md diff --git a/spec/introduce.md b/docs/spec/introduce.md similarity index 100% rename from spec/introduce.md rename to docs/spec/introduce.md diff --git a/spec/layout/demo/aside.md b/docs/spec/layout/demo/aside.md similarity index 100% rename from spec/layout/demo/aside.md rename to docs/spec/layout/demo/aside.md diff --git a/spec/layout/demo/ceiling.md b/docs/spec/layout/demo/ceiling.md similarity index 100% rename from spec/layout/demo/ceiling.md rename to docs/spec/layout/demo/ceiling.md diff --git a/spec/layout/demo/top-aside.md b/docs/spec/layout/demo/top-aside.md similarity index 100% rename from spec/layout/demo/top-aside.md rename to docs/spec/layout/demo/top-aside.md diff --git a/spec/layout/demo/top.md b/docs/spec/layout/demo/top.md similarity index 100% rename from spec/layout/demo/top.md rename to docs/spec/layout/demo/top.md diff --git a/spec/layout/index.md b/docs/spec/layout/index.md similarity index 100% rename from spec/layout/index.md rename to docs/spec/layout/index.md diff --git a/spec/motion.md b/docs/spec/motion.md similarity index 100% rename from spec/motion.md rename to docs/spec/motion.md diff --git a/spec/page-transition.md b/docs/spec/page-transition.md similarity index 100% rename from spec/page-transition.md rename to docs/spec/page-transition.md diff --git a/spec/typography.md b/docs/spec/typography.md similarity index 100% rename from spec/typography.md rename to docs/spec/typography.md diff --git a/site/static/style.css b/site/static/style.css index 6f9f4830d..67c600fa3 100644 --- a/site/static/style.css +++ b/site/static/style.css @@ -14,7 +14,7 @@ body { line-height: 1.5; color: #666; font-size: 14px; - background: #fff; + background: #ECECEC; transition: background 1s cubic-bezier(0.075, 0.82, 0.165, 1); overflow-x: hidden; } @@ -67,8 +67,8 @@ a:hover { header { width: 100%; background: #fff; - border-bottom: 1px solid #eee; font-size: 16px; + margin-bottom: 24px; } .fn-hide { @@ -92,7 +92,7 @@ a.logo { text-transform: uppercase; font-size: 18px; font-family: "Hiragino Sans GB","Microsoft YaHei","微软雅黑",sans-serif; - color: #6EB4E0; + color: #2db7f5; } .logo img { @@ -204,22 +204,22 @@ a.nav-link-disabled { } .nav ul li.current a { - color: #6AC2F5; + color: #2db7f5; font-weight: 600; } .nav ul li a:hover, .nav ul li .hover { - color: #6AC2F5; + color: #2db7f5; } .nav .bar { width: 20%; height: 3px; position: absolute; - top: 0; + bottom: 0; left: 0; - background: #6AC2F5; + background: #2db7f5; display: none; transition: left .3s cubic-bezier(0.075, 0.82, 0.165, 1), width 1.5s cubic-bezier(0.075, 0.82, 0.165, 1); } @@ -320,7 +320,7 @@ a.nav-link-disabled { .load-main-box .load-bar { width: 0%; height: 2px; - background: #6EB4E0; + background: #2db7f5; transition: width .3s cubic-bezier(0.785, 0.135, 0.15, 0.86); -webkit-transition: width .3s cubic-bezier(0.785, 0.135, 0.15, 0.86);; } @@ -383,40 +383,45 @@ footer ul li > a { .aside-container { width: 260px; - background: #F9F9F9; - padding-top: 10px; padding-bottom: 50px; float: left; + border-right: 1px solid #e9e9e9; } .aside-container > ul > li { overflow: hidden; + position: relative; + right: -1px; + z-index: 1; +} + +.aside-container > ul > li > ul { + margin-left: 24px; } .aside-container li h4 { font-size: 14px; font-weight: 600; - padding: 10px 0 10px 46px; + padding: 0 0 0 24px; + line-height: 40px; + height: 40px; margin: 0; - color: #5C6B77; cursor: pointer; - transition: background .5s, border .5s; - border-left: 3px solid transparent; position: relative; z-index: 1; - background: #F9F9F9; position: relative; + background: #fff; + right: 1px; } .aside-container li h4:after { position: absolute; - top: 11px; - right: 30px; + top: 0; + right: 20px; content: "\e602"; font-family: "anticon"; transform: scale(0.6); font-size: 12px; - color: #5C6B76; opacity: 0; transition: all 0.3s ease; } @@ -434,17 +439,13 @@ footer ul li > a { display: block; } -.aside-container li > ul li { - border-left: 3px solid transparent; -} - .aside-container li a { line-height: 40px; height: 40px; display: block; - padding-left: 60px; + padding-left: 24px; font-size: 14px; - color: #5C6B76; + color: #666; } .aside-container li.type-divider { @@ -453,18 +454,7 @@ footer ul li > a { transform: scale(0.9); transform-origin: 0 50%; color: #aaa; - text-shadow: 0px 1px 0px #FFF; - margin: 6px 0 6px 48px; -} - -.aside-container > ul > li > a { - padding-left: 46px; - font-size: 14px; - border-left: 3px solid transparent; -} - -.aside-container > ul > li.current > a { - border-left: 0; + margin: 6px 0 6px 24px; } .aside-container .chinese { @@ -475,31 +465,36 @@ footer ul li > a { } .aside-container li a:hover { - color: #6EB4E0; + color: #2db7f5; } .aside-container .current { - background: #fff; - border-left: 3px solid #71B5DE; - color: #71B5DE; + border-right: 2px solid #2db7f5; + color: #2db7f5; } .aside-container .current a { - color: #71B5DE; + color: #2db7f5; } .main-wrapper { - background: #f9f9f9; + background: #fff; + width: 92%; + margin: 0 auto; + border-radius: 6px; + overflow: hidden; + padding: 24px 0 0; + margin-bottom: 24px; } .main-container { + border-left: 1px solid #e9e9e9; margin-left: 260px; - padding: 30px 40px 120px; - -webkit-animation: xRightMatrix .5s ease-out; - animation: xRightMatrix .5s ease-out; + padding: 0 40px 120px; background: #fff; min-height: 500px; position: relative; + left: -1px; } .main-container-center { @@ -530,6 +525,8 @@ footer ul li > a { .markdown h1 { color: #404040; font-weight: 500; + line-height: 40px; + margin-bottom: 24px; } .markdown h2, @@ -538,7 +535,7 @@ footer ul li > a { .markdown h5, .markdown h6 { color: #404040; - margin: 1.8em 0 1em 0; + margin: 1.6em 0 1em 0; font-weight: 500; } @@ -695,9 +692,10 @@ footer ul li > a { } .toc { - position: sticky; - top: 40px; - float: right; + position: fixed; + top: 130px; + right: 4%; + margin-right: 24px; font-size: 12px; } @@ -714,6 +712,7 @@ footer ul li > a { text-overflow: ellipsis; overflow: hidden; max-width: 120px; + line-height: 20px; } .toc a.current { @@ -1692,32 +1691,8 @@ footer ul li > a { -webkit-transform: rotateX(-180deg); } } + /***************************************************************************/ -.index-page header { - transition: opacity 0.5S; - -webkit-animation: xRightMatrix .5s ease-out; - animation: xRightMatrix .5s ease-out; -} -.index-page .nav { - -webkit-animation: yTopMatrix .5s ease-out .4s backwards; - animation: yTopMatrix .5s ease-out .4s backwards; -} - -.index-page footer { - -webkit-animation: yBottomMatrix .5s ease-out .6s backwards; - animation: yBottomMatrix .5s ease-out .6s backwards; -} - -.index-page .logo { - -webkit-animation: xLeftMatrix .5s ease-out; - animation: xLeftMatrix .5s ease-out; -} - -.index-page .search { - -webkit-animation: xRightMatrix .5s ease-out .2s backwards; - animation: xRightMatrix .5s ease-out .2s backwards; -} - .api-link { font-size: 16px; vertical-align: middle; @@ -2074,7 +2049,7 @@ a.entry-link:hover .anticon-smile { } #instantclick-bar { - background: #6EB4E0; + background: #2db7f5; } #versions-select { diff --git a/site/templates/layout.html b/site/templates/layout.html index 9f810d32b..d9a8fec09 100644 --- a/site/templates/layout.html +++ b/site/templates/layout.html @@ -66,17 +66,20 @@
  • 首页
    • -
  • - 实践 +
  • + 实践
    • -
  • - 模式 +
  • + 模式
    • -
  • - 语言 +
  • + 语言
    • -
  • - React UI +
  • + 组件 +
    • +
  • + 资源
    • diff --git a/site/theme.js b/site/theme.js index 8d7966422..0ae7b6941 100644 --- a/site/theme.js +++ b/site/theme.js @@ -15,6 +15,17 @@ module.exports = function(nico) { return Posts; } + function getRootDirectory(directory) { + var rootDirectory; + var directoryArray = directory.split('/'); + if (directory.indexOf('docs/') === 0) { + rootDirectory = directoryArray[0] + '/' + directoryArray[1]; + } else { + rootDirectory = directoryArray[0]; + } + return rootDirectory; + } + exports.reader = function(post) { var filepath = post.meta.filepath.toLowerCase(); if (filepath.indexOf('components') === 0) { @@ -51,15 +62,15 @@ module.exports = function(nico) { return ret; }, get_categories: function(posts, post) { - var rootDirectory = post.directory.split('/')[0]; + var rootDirectory = getRootDirectory(post.directory); if (!rootDirectory && post.filename.indexOf('CHANGELOG') < 0) { return; } var directories = [rootDirectory]; // docs 和 components 放在同一页 - if (rootDirectory === 'docs' || rootDirectory === 'components' || + if (rootDirectory === 'docs/react' || rootDirectory === 'components' || post.filename.indexOf('CHANGELOG') >= 0) { - directories = ['docs', 'components']; + directories = ['docs/react', 'components']; } var cacheKey = directories.join('-'); var categories; @@ -68,11 +79,12 @@ module.exports = function(nico) { } else { categories = {}; _.uniq(getAllPosts(posts).forEach(function(item) { - var itemDirectory = item.directory.split('/')[0]; + var itemDirectory = getRootDirectory(item.directory); var cat = item.meta.category; if (!cat) { return; } + console.log(itemDirectory, item.directory, directories); if (directories.indexOf(itemDirectory) >= 0 || item.filename.indexOf('CHANGELOG') >= 0) { item.filename = item.filename.toLowerCase();