Commit 2e0efbb0 authored by afc163's avatar afc163

update dependencies and fix lint and test case

parent e2b1261c
......@@ -20,6 +20,7 @@
"selector-list-comma-newline-after": null,
"selector-pseudo-element-colon-notation": null,
"unit-no-unknown": null,
"no-descending-specificity": null,
"value-list-max-empty-lines": null
}
}
......@@ -6,8 +6,8 @@ import styles from './index.less';
export default ({ className, title, col = 3, layout = 'horizontal', gutter = 32,
children, size, ...restProps }) => {
const clsString = classNames(styles.descriptionList, styles[layout], className, {
[styles.descriptionListSmall]: size === 'small',
[styles.descriptionListLarge]: size === 'large',
[styles.small]: size === 'small',
[styles.large]: size === 'large',
});
const column = col > 4 ? 4 : col;
return (
......
......@@ -40,8 +40,29 @@
display: table-cell;
}
&.vertical {
&.small {
// offset the padding-bottom of last row
:global {
.ant-row {
margin-bottom: -8px;
}
}
.title {
margin-bottom: 12px;
color: @text-color;
}
.term, .detail {
padding-bottom: 8px;
}
}
&.large {
.title {
font-size: 16px;
}
}
&.vertical {
.term {
padding-bottom: 8px;
display: block;
......@@ -52,24 +73,3 @@
}
}
}
.descriptionListSmall {
// offset the padding-bottom of last row
:global {
.ant-row {
margin-bottom: -8px;
}
}
.title {
margin-bottom: 12px;
color: @text-color;
}
.term, .detail {
padding-bottom: 8px;
}
}
.descriptionListLarge {
.title {
font-size: 16px;
}
}
......@@ -60,8 +60,8 @@ i.trigger {
font-size: 16px;
vertical-align: middle;
}
&:global(.ant-popover-open),
&:hover {
&:hover,
&:global(.ant-popover-open) {
background: @primary-1;
}
}
......
......@@ -83,11 +83,6 @@
padding-right: 24px;
line-height: 55px;
}
}
}
.salesCard {
:global {
.ant-card-head {
position: relative;
}
......
......@@ -64,7 +64,7 @@
}
.money {
font-family: Helvetica Neue;
font-family: "Helvetica Neue", sans-serif;
font-weight: 500;
font-size: 20px;
line-height: 14px;
......
......@@ -15,15 +15,13 @@
}
.ant-list-pagination {
text-align: right;
margin-top: 24px;
}
.ant-avatar-lg {
width: 48px;
height: 48px;
line-height: 48px;
}
.ant-list-pagination {
margin-top: 24px;
}
}
.headerInfo {
position: relative;
......
......@@ -3,7 +3,7 @@ global.requestAnimationFrame =
global.requestAnimationFrame || function requestAnimationFrame(callback) {
setTimeout(callback, 0);
};
import { jsdom } from 'jsdom';
import { JSDOM } from 'jsdom';
import Enzyme from 'enzyme';
import Adapter from 'enzyme-adapter-react-16';
......@@ -11,6 +11,6 @@ Enzyme.configure({ adapter: new Adapter() });
// fixed jsdom miss
const documentHTML = '<!doctype html><html><body><div id="root"></div></body></html>';
global.document = jsdom(documentHTML);
global.document = new JSDOM(documentHTML);
global.window = document.defaultView;
global.navigator = global.window.navigator;
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment