Merge branch master into develop-1.0.0

ddcat1115 · May 5, 2016 · 300e2d3 · 300e2d3
2 parents f7abfb7 + b0774a7
commit 300e2d3
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,6 +9,11 @@ timeline: true
 
 ---
 
+## 0.12.17
+
+- 修复 FormItem 校验时表单项高度跳动的问题。[#1557](https://github.com/ant-design/ant-design/issues/1557)
+- 修复一个 Table 圆角样式的小问题。
+
 ## 0.12.16
 
 - 修复 Collapse 在 safari 中切换动画异常的问题。[#1494](https://github.com/ant-design/ant-design/issues/1494)

diff --git a/components/table/style/index.less b/components/table/style/index.less
@@ -21,6 +21,8 @@
     width: 100%;
     border-collapse: separate;
     text-align: left;
+    border-radius: @border-radius-base;
+    overflow: hidden;
   }
 
   th {