mirror/ant-design
1
0
Fork 0
mirror of https://github.com/ant-design/ant-design.git synced 2025-08-02 13:56:40 +08:00
Code Issues Actions 19 Packages Projects Releases Wiki Activity

Merge branch 'master' into feature

Browse Source 
* master:
  revert deleting @font-variant-base by accident
  update default menu background
  site: update header responsive ui
  update FAQ doc
  add test case for month picker
This commit is contained in:
afc163 2018-11-05 13:56:19 +08:00
commit d05c0c19a2
3 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
components/date-picker/__tests__/MonthPicker.test.js
View File

@ -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');
});
});

3
components/style/themes/default.less
View File

@ -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;

4
site/theme/template/Layout/Header.jsx
View File

@ -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} />