Merge origin/4.0-prepare into feat-dark-palette

This commit is contained in:
ycjcl868 2019-12-21 15:51:05 +08:00
commit d60b736762
2 changed files with 1 additions and 3 deletions

View File

@ -55,7 +55,7 @@ a {
}
.aside-container {
height: 100%;
min-height: 100%;
padding-bottom: 48px;
font-family: Avenir, @font-family, sans-serif;

View File

@ -6,7 +6,6 @@ import classNames from 'classnames';
import { Select, Menu, Row, Col, Popover, Input, Button, Badge } from 'antd';
import Icon from '../Icon';
import Santa from './Santa';
import * as utils from '../utils';
import { version as antdVersion } from '../../../../package.json';
@ -269,7 +268,6 @@ class Header extends React.Component {
alt="Ant Design"
src="https://gw.alipayobjects.com/zos/rmsportal/DkKNubTaaVsKURhcVGkh.svg"
/>
<Santa />
</Link>
</Col>
<Col xxl={20} xl={19} lg={19} md={19} sm={0} xs={0}>