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

docs/cases.md

@@ -1,5 +1,9 @@
 # 案例
 
+- category: cases
+
 ---
 
 🌰
+
+待补充。

docs/design.md

@@ -1,6 +1,7 @@
 # 设计
 
+- category: design
+
 ---
 
-
-
+待补充。

docs/develop-as-components.md

@@ -0,0 +1,8 @@
+# 组件开发模式
+
+- category: start
+- order: 2
+
+---
+
+待补充。

docs/download.md

@@ -1,5 +1,8 @@
 # 下载
 
+- category: start
+- order: 3
+
 ---
 
-
+待补充。

docs/getting-started.md

@@ -0,0 +1,8 @@
+# 快速上手
+
+- category: start
+- order: 1
+
+---
+
+待补充。

docs/introduce.md

@@ -0,0 +1,17 @@
+# 介绍
+
+- category: start
+- order: 0
+
+---
+
+下一个设计&前端框架。
+
+
+## 特性
+
+
+## 谁在使用
+
+
+## Roadmap

docs/modes.md

@@ -1,3 +1,7 @@
 # 模式
 
+- category: modes
+
 ---
+
+待补充。

docs/start.md

@@ -1,19 +0,0 @@
-# Ant Design
-
----
-
-下一个设计&前端框架。
-
-## 五分钟上手
-
-
-## 介绍
-
-
-## 工具
-
-
-## 部署和使用
-
-
-## 谁在使用

static/home.js

@@ -183,7 +183,6 @@ $(function () {
                 self.textTween();
                 $("body").addClass("index-page");
                 var header=$("#header")||$("header"),footer=$("#footer")||$("footer");
-                header.removeAttr("style");
                 footer.removeAttr("style")
             },500);
 

static/homeLoad.js

@@ -11,7 +11,6 @@ $(function () {
             self.header=$("#header")||$("header");
             self.main=$(".main");
             self.footer=$("#footer")||$("footer");
-            self.header.css("opacity",0);
             self.footer.css("opacity",0);
             self.addLoad()
         },

static/style.css

@@ -117,7 +117,6 @@ header {
   overflow: hidden;
   border-bottom: 1px solid #eee;
   font-size: 16px;
-
 }
 
 .fn-hide {
@@ -231,6 +230,8 @@ header {
   font-size: 0.875em;
   position: relative;
   margin-right: 25px;
+  -webkit-animation: yTopMatrix .5s ease-out .5s backwards;
+  animation: yTopMatrix .5s ease-out .5s backwards;
 }
 
 .nav ul li {
@@ -429,6 +430,7 @@ footer ul li > a {
   width: 260px;
   background: #F9F9F9;
   padding-top: 10px;
+  margin-bottom: 50px;
 }
 
 .aside-container>ul>li {
@@ -1537,10 +1539,6 @@ footer ul li > a {
 .index-page header{
     transition: opacity 0.5S;
 }
-.index-page .nav {
-  -webkit-animation: yTopMatrix .5s ease-out .5s backwards;
-  animation: yTopMatrix .5s ease-out .5s backwards;
-}
 
 .index-page footer {
   -webkit-animation: yBottomMatrix .5s ease-out 1s backwards;

theme/templates/aside.html

@@ -1,22 +1,14 @@
-<script src="/dist/index.js"></script>
-{%- set categories = resource.pages|get_all_category %}
 <aside class="aside-container">
   <ul>
-  {%- for category in categories %}
-  {%- set items = resource.pages|find_category(category) %}
+  {%- set items = resource.pages|find_category(post.meta.category) %}
   <li>
-      <h4>{{category}}</h4>
     <ul>
       {%- for item in items %}
       <li class="{%- if item.title === post.title %}current{%- endif %}">
-          <a href="{{permalink_url(item)}}">
-            {{item.title}}
-            <span class="chinese">{{item.meta.chinese}}</span>
-          </a>
+        <a href="{{permalink_url(item)}}">{{item.title}}</a>
       </li>
       {%- endfor %}
     </ul>
   </li>
-  {%- endfor %}
   </ul>
 </aside>

theme/templates/component-aside.html

@@ -0,0 +1,22 @@
+<script src="/dist/index.js"></script>
+{%- set categories = resource.pages|get_all_category %}
+<aside class="aside-container">
+  <ul>
+  {%- for category in categories %}
+  {%- set items = resource.pages|find_category(category) %}
+    <li>
+      <h4>{{category}}</h4>
+      <ul>
+        {%- for item in items %}
+        <li class="{%- if item.title === post.title %}current{%- endif %}">
+          <a href="{{permalink_url(item)}}">
+            {{item.title}}
+            <span class="chinese">{{item.meta.chinese}}</span>
+          </a>
+        </li>
+        {%- endfor %}
+      </ul>
+    </li>
+  {%- endfor %}
+  </ul>
+</aside>

theme/templates/component.html

@@ -1,7 +1,7 @@
 {% extends "page.html" %}
 
 {% block aside %}
-{%- include "aside.html" %}
+{%- include "component-aside.html" %}
 {% endblock %}
 
 {% block content %}

theme/templates/home.html

@@ -1,4 +1,4 @@
-{% extends "page.html" %}
+{% extends "layout.html" %}
 
 {% block content %}
 <div class="main-box" id="main">

theme/templates/layout.html

@@ -36,8 +36,8 @@
         <li class="{%- if post.meta.filepath === 'README.md' %}current{%- endif %}">
           <a href="/">首页</a>
         </li>
-        <li class="{%- if post.filename === 'start' %}current{%- endif %}">
-          <a href="/docs/start">上手</a>
+        <li class="{%- if post.meta.category === 'start' %}current{%- endif %}">
+          <a href="/docs/introduce">上手</a>
         </li>
         <li class="{%- if post.filename === 'design' %}current{%- endif %}">
           <a href="/docs/design">设计</a>

theme/templates/page.html

@@ -10,10 +10,12 @@
 
 {% block description %}{% if post.summay %}{{post.summary}}{% endif %}{% endblock %}
 
-{% block aside %}{% endblock %}
+{% block aside %}
+{%- include "aside.html" %}
+{% endblock %}
 
 {% block content %}
-<section class="main-container main-container-center">
+<section class="main-container">
   <article class="markdown">
     <h1>{{ post.title }} {{ post.meta.chinese }}</h1>
     {{ post.html }}