From 782881e3ca0747b6b96847bcbcfb5e3d82e3c8e2 Mon Sep 17 00:00:00 2001
From: zombiej <smith3816@gmail.com>
Date: Sun, 4 Nov 2018 19:44:10 +0800
Subject: [PATCH 1/5] add test case for month picker

---
 .../date-picker/__tests__/MonthPicker.test.js       | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/components/date-picker/__tests__/MonthPicker.test.js b/components/date-picker/__tests__/MonthPicker.test.js
index 51d11d7620..2056ec9347 100644
--- a/components/date-picker/__tests__/MonthPicker.test.js
+++ b/components/date-picker/__tests__/MonthPicker.test.js
@@ -1,8 +1,21 @@
+import React from 'react';
+import { mount } from 'enzyme';
+import moment from 'moment';
 import DatePicker from '..';
 import focusTest from '../../../tests/shared/focusTest';
+import { openPanel } from './utils';
 
 const { MonthPicker } = DatePicker;
 
 describe('MonthPicker', () => {
   focusTest(MonthPicker);
+
+  it('reset select item when popup close', () => {
+    const wrapper = mount(
+      <MonthPicker value={moment('2018-07-01')} />
+    );
+    openPanel(wrapper);
+    wrapper.find('.ant-calendar-month-panel-month').first().simulate('click');
+    wrapper.find('.ant-calendar-month-panel-cell').at(6).hasClass('ant-calendar-month-panel-selected-cell');
+  });
 });

From f985eb948fc8bcb7d0421c10227db7383299c3cf Mon Sep 17 00:00:00 2001
From: afc163 <afc163@gmail.com>
Date: Sun, 4 Nov 2018 17:58:03 +0800
Subject: [PATCH 2/5] update FAQ doc

---
 docs/react/faq.en-US.md | 5 +++--
 docs/react/faq.zh-CN.md | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/docs/react/faq.en-US.md b/docs/react/faq.en-US.md
index 952d36d4bc..8401921954 100644
--- a/docs/react/faq.en-US.md
+++ b/docs/react/faq.en-US.md
@@ -108,8 +108,9 @@ If you need some features which should not be included in antd, try to extend an
 
 ### How to spell Ant Design correctly?
 
-- ✅ **Ant Design**: Capitalized with space, for the design language
-- ✅ **antd**: all lowercase, for the React UI library
+- ✅ **Ant Design**: Capitalized with space, for the design language.
+- ✅ **antd**: all lowercase, for the React UI library.
+- ✅ **ant.design**：For ant.design website url.
 
 Here are some typical wrong examples:
 
diff --git a/docs/react/faq.zh-CN.md b/docs/react/faq.zh-CN.md
index cd370d7b33..19a038fbbf 100644
--- a/docs/react/faq.zh-CN.md
+++ b/docs/react/faq.zh-CN.md
@@ -106,8 +106,9 @@ import { Menu, Breadcrumb, Icon } from 'antd';
 
 ### 如何正确的拼写 Ant Design？
 
-- ✅ **Ant Design**：用空格分隔的首字母大写单词，指代设计语言
-- ✅ **antd**：全小写，指代 React UI 组件库
+- ✅ **Ant Design**：用空格分隔的首字母大写单词，指代设计语言。
+- ✅ **antd**：全小写，指代 React UI 组件库。
+- ✅ **ant.design**：特指 ant.design 网站网址。
 
 下面是一些典型的错误例子：
 

From c2184d6334a716f48266cbf86c252d5ec5e87f5b Mon Sep 17 00:00:00 2001
From: afc163 <afc163@gmail.com>
Date: Mon, 5 Nov 2018 11:59:15 +0800
Subject: [PATCH 3/5] site: update header responsive ui

---
 site/theme/template/Layout/Header.jsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/site/theme/template/Layout/Header.jsx b/site/theme/template/Layout/Header.jsx
index bb1e92ea01..9b826b0c07 100644
--- a/site/theme/template/Layout/Header.jsx
+++ b/site/theme/template/Layout/Header.jsx
@@ -200,13 +200,13 @@ export default class Header extends React.Component {
           </Popover>
         )}
         <Row>
-          <Col xxl={4} xl={5} lg={5} md={6} sm={24} xs={24}>
+          <Col xxl={4} xl={5} lg={5} md={5} sm={24} xs={24}>
             <Link to={utils.getLocalizedPathname('/', isZhCN)} id="logo">
               <img alt="logo" src="https://gw.alipayobjects.com/zos/rmsportal/KDpgvguMpGfqaHPjicRK.svg" />
               <img alt="Ant Design" src="https://gw.alipayobjects.com/zos/rmsportal/DkKNubTaaVsKURhcVGkh.svg" />
             </Link>
           </Col>
-          <Col xxl={20} xl={19} lg={19} md={18} sm={0} xs={0}>
+          <Col xxl={20} xl={19} lg={19} md={19} sm={0} xs={0}>
             <div id="search-box">
               <Icon type="search" />
               <Input ref={ref => this.searchInput = ref} placeholder={searchPlaceholder} />

From f41b1db572582a7c57496f3e6c73e54550af95e7 Mon Sep 17 00:00:00 2001
From: afc163 <afc163@gmail.com>
Date: Mon, 5 Nov 2018 12:01:17 +0800
Subject: [PATCH 4/5] update default menu background

---
 components/style/themes/default.less | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/style/themes/default.less b/components/style/themes/default.less
index b7c3107ffb..29b92966df 100644
--- a/components/style/themes/default.less
+++ b/components/style/themes/default.less
@@ -320,7 +320,7 @@
 @menu-inline-toplevel-item-height: 40px;
 @menu-item-height: 40px;
 @menu-collapsed-width: 80px;
-@menu-bg: @component-background;
+@menu-bg: transparent;
 @menu-item-color: @text-color;
 @menu-highlight-color: @primary-color;
 @menu-item-active-bg: @item-active-bg;

From 799c26a13b3389e96a51e8c90939fd2a445debae Mon Sep 17 00:00:00 2001
From: afc163 <afc163@gmail.com>
Date: Mon, 5 Nov 2018 13:53:38 +0800
Subject: [PATCH 5/5] revert deleting @font-variant-base by accident

---
 components/style/themes/default.less | 1 +
 1 file changed, 1 insertion(+)

diff --git a/components/style/themes/default.less b/components/style/themes/default.less
index 29b92966df..0778f648ef 100644
--- a/components/style/themes/default.less
+++ b/components/style/themes/default.less
@@ -43,6 +43,7 @@
 @heading-color-dark     : fade(#fff, 100%);
 @text-color-dark        : fade(#fff, 85%);
 @text-color-secondary-dark: fade(#fff, 65%);
+@font-variant-base      : tabular-nums;
 @font-size-base         : 14px;
 @font-size-lg           : @font-size-base + 2px;
 @font-size-sm           : 12px;