Merge branch 'master' of github.com:ant-design/ant-design

site/common/styles/markdown.less

@@ -159,6 +159,7 @@
 
 .markdown .waiting {
   color: #ccc;
+  cursor: not-allowed;
 }
 
 .markdown h1:hover .anchor,

site/common/styles/responsive.less

@@ -25,7 +25,7 @@
   }
 
   a#logo {
-    width: 144px;
+    width: 150px;
     margin-left: auto;
     margin-right: auto;
     float: none;
@@ -64,8 +64,18 @@
     animation: moveLeftOut .2s ease-in forwards;
   }
 
-  ul#nav, ul#nav li {
+  ul#nav,
+  ul#nav li {
     width: 100%;
+    font-size: 14px;
+  }
+
+  ul#nav li {
+    line-height: 60px;
+    height: 60px;
+    a {
+      color: #333;
+    }
   }
 
   .toc {

site/common/styles/toc.less

@@ -42,7 +42,7 @@
 .toc-affix {
   position: absolute;
   top: 8px;
-  right: 30px;
+  right: 20px;
 }
 
 .demos-anchor {

site/component/Article/index.jsx

@@ -11,8 +11,18 @@ export default class Article extends React.Component {
   componentDidUpdate() {
     const { chinese, english } = this.props.content.meta;
     utils.setTitle(`${chinese || english} - Ant Design`);
+    const links = Array.apply(null, document.querySelectorAll('.outside-link.internal'));
+    if (links.length === 0) {
+      return;
+    }
+    const checkImgUrl = 'http://alipay-rmsdeploy-dev-image.oss-cn-hangzhou-zmf.aliyuncs.com/rmsportal/JdVaTbZzPxEldUi.png';
+    utils.ping(checkImgUrl, status => {
+      if (status === 'responded') {
+        links.forEach(link => (link.style.display = 'block'));
+      }
+    });
   }
-  getTimelineFromArticle(article) {
+  getArticle(article) {
     const { content } = this.props;
     const { meta } = content;
     if (!meta.timeline) {
@@ -69,7 +79,7 @@ export default class Article extends React.Component {
             null
         }
         {
-          this.getTimelineFromArticle(utils.jsonmlToComponent(
+          this.getArticle(utils.jsonmlToComponent(
             location.pathname,
             ['section', { className: 'markdown' }].concat(description)
           ))

site/component/Footer/index.jsx

@@ -1,5 +1,5 @@
 import React from 'react';
-import { Select } from 'antd';
+import { Select, Modal } from 'antd';
 import { version as antdVersion } from '../../../package.json';
 import { docVersions } from '../../website.config';
 const Option = Select.Option;
@@ -7,13 +7,36 @@ const Option = Select.Option;
 docVersions[antdVersion] = antdVersion;
 
 export default class Footer extends React.Component {
-  constructor(props) {
+  componentDidMount() {
-    super(props);
+    // 大版本发布后全局弹窗提示
-
+    //   1. 点击『知道了』之后不再提示
-    this.handleVersionChange = this.handleVersionChange.bind(this);
+    //   2. 超过截止日期后不再提示
+    if (localStorage.getItem('infoNewVersionSent') !== 'true' ||
+        new Date().getTime() > new Date('2016/05/22').getTime()) {
+      this.infoNewVersion();
+    }
   }
 
-  handleVersionChange(url) {
+  infoNewVersion() {
+    Modal.info({
+      title: '尊敬的用户，antd@1.0 已正式发布。',
+      content: (
+        <div style={{ marginTop: '1em' }}>
+          <p>
+            1.0 版本有 <a target="_blank" href="/#/changelog">大量改进</a>
+            ，欢迎升级。
+          </p>
+          <p style={{ marginTop: '1em' }}>
+            如果您还需要使用旧版，请查阅 <a target="_blank" href="http://012x.ant.design">012x.ant.design</a>
+          ，也可通过页面右下角的文档版本选择框进行切换。
+          </p>
+        </div>
+      ),
+      onOk: () => localStorage.setItem('infoNewVersionSent', 'true'),
+    });
+  }
+
+  handleVersionChange = (url) => {
     window.location.href = url;
   }
 

site/component/Home/index.jsx

@@ -54,6 +54,14 @@ export default class Home extends React.Component {
       .home-nav-white #nav a {
         color: #666;
       }
+      .nav-phone-icon:before {
+        background: #eee;
+        box-shadow: 0 7px 0 0 #eee, 0 14px 0 0 #eee;
+      }
+      .home-nav-white .nav-phone-icon:before {
+        background: #777;
+        box-shadow: 0 7px 0 0 #777, 0 14px 0 0 #777;
+      }
       #nav a {
         color: #eee;
         transition: color 0.5s cubic-bezier(0.455, 0.03, 0.515, 0.955);

site/component/utils.js

@@ -62,3 +62,19 @@ export function jsonmlToComponent(pathname, jsonml) {
 export function setTitle(title) {
   document.title = title;
 }
+
+export function ping(url, callback) {
+  const img = new Image();
+  let done;
+  const finish = (status) => {
+    if (!done) {
+      done = true;
+      img.src = '';
+      callback(status);
+    }
+  };
+  img.onload = () => finish('responded');
+  img.onerror = () => finish('error');
+  img.src = url;
+  setTimeout(() => finish('timeout'), 1500);
+}

site/website.config.js

@@ -1,7 +1,6 @@
 export default {
   categoryOrder: {
     组件: 0,
-
     十大原则: 0,
     设计基础: 1,
     动画: 2,
@@ -13,11 +12,9 @@ export default {
     导航: 3,
     其它: 4,
   },
-
   redirects: {
     CHANGELOG: 'docs/react/changelog',
   },
-
   docVersions: {
     '0.9.x': 'http://09x.ant.design/',
     '0.10.x': 'http://010x.ant.design/',