Merge branch 'develop-0.12.0' of github.com:ant-design/ant-design into develop-0.12.0

CHANGELOG.md

@@ -4,7 +4,7 @@
 
 ---
 
-## 0.11.2 `fixing`
+## 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)

components/table/demo/row-selection-and-operation.md

@@ -1,6 +1,6 @@
 # 选择和操作
 
-- order: 4
+- order: 2
 
 选择后进行操作，完成后清空选择，通过 `rowSelection.selectedRowKeys` 来控制选中项。
 

components/table/demo/row-selection-props.md

@@ -1,6 +1,6 @@
-# 默认选择
+# 选择框属性
 
-- order: 2
+- order: 3
 
 配置选择框的默认属性。
 

components/table/demo/size.md

@@ -1,4 +1,4 @@
-# 中小型列表
+# 紧凑型
 
 - order: 9
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "antd",
-  "version": "0.12.0-beta2",
+  "version": "0.12.0-beta3",
   "title": "Ant Design",
   "description": "一个 UI 设计语言",
   "homepage": "http://ant.design/",

site/static/script.js

@@ -41,6 +41,18 @@ InstantClickChangeFns.push(function() {
     }
   });
 
+  function hashChange() {
+    if (location.hash.indexOf('#demo-') === 0) {
+      $('.demos-anchor a').removeClass('current');
+      $('.demos-anchor a[href="' + location.hash + '"]').addClass('current');
+    }
+  }
+
+  hashChange();
+
+  // 高亮侧边演示菜单
+  $(window).on('hashchange', hashChange);
+
   // 移动 API 文档到演示下方
   $('.markdown #api').nextAll().andSelf().appendTo('.api-container');
 

site/static/style.css

@@ -1725,7 +1725,7 @@ footer ul li > a {
   display: inline-block;
   width: 100%;
   position: relative;
-  margin: 0px 15px 15px 0px;
+  margin: 0px 0 16px 0px;
   transition: all 0.5s ease;
 }
 
@@ -2111,6 +2111,7 @@ a.entry-link:hover .anticon-smile {
   border-radius: 0 0 5px 5px;
   background: #ececec;
 }
+
 .window-frame .status-bar {
   height: 2rem;
   border-radius: 0 0 0.35rem 0.35rem;
@@ -2120,18 +2121,22 @@ a.entry-link:hover .anticon-smile {
 .demos-anchor {
   color: #aaa;
   position: fixed;
-  bottom: 50%;
+  top: 120px;
   right: 0;
   z-index: 100;
-  transform: translateY(50%);
   transition: all 0.3s ease;
   background: #fff;
-  padding: 8px 18px 8px 28px;
-  border: 1px dashed #e9e9e9;
+  background: rgba(255,255,255,0.9);
+  padding: 8px 10px 8px 24px;
   border-radius: 6px 0 0 6px;
   margin: 0;
   font-size: 12px;
   border-right: 0;
+  -webkit-animation: .5s ease-out 0.5s xRightMatrix;
+  animation: .5s ease-out 0.5s xRightMatrix;
+  -webkit-animation-fill-mode: forwards;
+  animation-fill-mode: forwards;
+  opacity: 0;
 }
 
 .demos-anchor li {
@@ -2154,6 +2159,7 @@ a.entry-link:hover .anticon-smile {
   position: relative;
 }
 
+.demos-anchor a.current > span,
 .demos-anchor a > span:hover {
   color: #2db7f5;
 }

site/templates/demos.html

@@ -10,6 +10,16 @@
   </a>
   {%- endif %}
 </h2>
+<ul class="demos-anchor">
+  {%- for item in items %}
+  {%- set post = item.meta.filepath|parsePost %}
+  <li>
+    <a title="{{ post.title }}" href="#{{post.meta.id|removeCodeBoxIdPrefix}}">
+      <span>{{ post.title }}</span>
+    </a>
+  </li>
+  {%- endfor %}
+</ul>
 <div class="code-boxes">
   {%- if post.meta.cols == 1 %}
     <div class="code-boxes-col-1-1">
@@ -33,14 +43,4 @@
   </div>
   {%- endif %}
 </div>
-<ul class="demos-anchor">
-  {%- for item in items %}
-  {%- set post = item.meta.filepath|parsePost %}
-  <li>
-    <a title="{{ post.title }}" href="#{{post.meta.id|removeCodeBoxIdPrefix}}">
-      <span>{{ post.title }}</span>
-    </a>
-  </li>
-  {%- endfor %}
-</ul>
 {%- endif %}

style/components/upload.less

@@ -160,6 +160,7 @@
     height: 48px;
     display: inline-block;
     overflow: hidden;
+    vertical-align: middle;
   }
 
   &-picture &-item-thumbnail img {
@@ -178,7 +179,6 @@
     overflow: hidden;
     text-overflow: ellipsis;
     white-space: nowrap;
-    vertical-align: top;
     margin: 0 0 0 8px;
     line-height: 42px;
     transition: all 0.3s ease;