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( + + ); + 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'); + }); }); diff --git a/components/style/themes/default.less b/components/style/themes/default.less index 405f3d4c64..d45b307f16 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; @@ -320,7 +321,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; 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 { )} - + logo Ant Design - +