Merge branch 'master' into antd-3.0

components/menu/__tests__/__snapshots__/demo.test.js.snap

@@ -105,6 +105,7 @@ exports[`renders ./components/menu/demo/inline.md correctly 1`] = `
       >
         <div
           class="ant-menu-item-group-title"
+          title="Item 1"
         >
           Item 1
         </div>
@@ -134,6 +135,7 @@ exports[`renders ./components/menu/demo/inline.md correctly 1`] = `
       >
         <div
           class="ant-menu-item-group-title"
+          title="Item 2"
         >
           Item 2
         </div>
@@ -583,6 +585,7 @@ exports[`renders ./components/menu/demo/switch-mode.md correctly 1`] = `
             aria-owns="sub2$Menu"
             class="ant-menu-submenu-title"
             style="padding-left:48px;"
+            title="Submenu"
           >
             Submenu
             <i

components/menu/demo/inline-collapsed.md

@@ -9,10 +9,14 @@ title:
 
 内嵌菜单可以被缩起/展开。
 
+你可以在 [Layout](/components/layout/#components-layout-demo-side) 里查看侧边布局结合的完整示例。
+
 ## en-US
 
 Inline menu could be collapsed.
 
+Here is [a complete demo](/components/layout/#components-layout-demo-side) with sider layout.
+
 ````jsx
 import { Menu, Icon, Button } from 'antd';
 const SubMenu = Menu.SubMenu;

components/menu/style/index.less

@@ -28,8 +28,9 @@
   &-item-group-title {
     color: @text-color-secondary;
     font-size: @font-size-base;
-    line-height: 1.5;
+    line-height: @line-height-base;
     padding: 8px 16px;
+    transition: all .3s;
   }
 
   &-item,
@@ -359,7 +360,9 @@
 
   &-inline-collapsed {
     width: @menu-collapsed-width;
+
     > .@{menu-prefix-cls}-item,
+    > .@{menu-prefix-cls}-item-group > .@{menu-prefix-cls}-item-group-list > .@{menu-prefix-cls}-item,
     > .@{menu-prefix-cls}-submenu > .@{menu-prefix-cls}-submenu-title {
       left: 0;
       text-overflow: clip;
@@ -387,6 +390,14 @@
         color: @text-color-dark;
       }
     }
+
+    .@{menu-prefix-cls}-item-group-title {
+      overflow: hidden;
+      white-space: nowrap;
+      text-overflow: ellipsis;
+      padding-left: 4px;
+      padding-right: 4px;
+    }
   }
 
   &-item-group-list {

components/modal/Modal.tsx

@@ -40,7 +40,7 @@ export interface ModalProps {
   transitionName?: string;
   className?: string;
   getContainer?: (instance: React.ReactInstance) => HTMLElement;
-  zIndex?: boolean;
+  zIndex?: number;
 }
 
 export interface ModalContext {

components/table/__tests__/__snapshots__/Table.filter.test.js.snap

@@ -193,6 +193,7 @@ exports[`Table.filter renders menu correctly 1`] = `
             aria-haspopup="true"
             aria-owns="title$Menu"
             class="ant-dropdown-menu-submenu-title"
+            title="Title"
           >
             Title
             <i
@@ -290,6 +291,7 @@ exports[`Table.filter renders radio filter correctly 1`] = `
             aria-haspopup="true"
             aria-owns="title$Menu"
             class="ant-dropdown-menu-submenu-title"
+            title="Title"
           >
             Title
             <i

docs/react/use-with-create-react-app.en-US.md

@@ -207,3 +207,4 @@ There are a lot of great boilerplates like create-react-app in React community.
 - [comerc/cra-ts-antd](https://github.com/comerc/cra-ts-antd)
 - [react-boilerplate/react-boilerplate](https://github.com/ant-design/react-boilerplate)
 - [kriasoft/react-starter-kit](https://github.com/ant-design/react-starter-kit)
+- [next.js](https://github.com/zeit/next.js/tree/v3-beta/examples/with-ant-design)

docs/react/use-with-create-react-app.zh-CN.md

@@ -207,3 +207,4 @@ React 生态圈中还有很多优秀的脚手架，使用它们并引入 antd
 - [kriasoft/react-starter-kit](https://github.com/ant-design/react-starter-kit)
 - [create-react-app-antd](https://github.com/ant-design/create-react-app-antd)
 - [cra-ts-antd](https://github.com/comerc/cra-ts-antd)
+- [next.js](https://github.com/zeit/next.js/tree/v3-beta/examples/with-ant-design)

site/theme/static/template.html

@@ -4,9 +4,7 @@
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <meta name="description" content="An enterprise-class UI design language and React-based implementation">
-    <meta name="description" content="A set of high-quality React components">
-    <meta name="description" content="One of best React UI library for enterprise background">
+    <meta name="description" content="An enterprise-class UI design language and React-based implementation with a set of high-quality React components, one of best React UI library for enterprises">
     <title>Ant Design - A UI Design Language</title>
     <script>
     (function() {