Commit 63b76456 authored by afc163's avatar afc163

Remove v2 reset styles

parent ebde3e57
...@@ -14,7 +14,7 @@ const ChartCard = ({ ...@@ -14,7 +14,7 @@ const ChartCard = ({
</div> </div>
{ {
// eslint-disable-next-line // eslint-disable-next-line
total && <p className={styles.total} dangerouslySetInnerHTML={{ __html: total }} /> total && <div className={styles.total} dangerouslySetInnerHTML={{ __html: total }} />
} }
<div className={styles.content} style={{ height: contentHeight || 'auto' }}> <div className={styles.content} style={{ height: contentHeight || 'auto' }}>
<div className={contentHeight && styles.contentFixed}> <div className={contentHeight && styles.contentFixed}>
......
...@@ -26,6 +26,7 @@ ...@@ -26,6 +26,7 @@
.textOverflow(); .textOverflow();
color: @heading-color; color: @heading-color;
margin-top: 4px; margin-top: 4px;
margin-bottom: 0;
font-size: 30px; font-size: 30px;
line-height: 38px; line-height: 38px;
height: 38px; height: 38px;
......
...@@ -3,10 +3,10 @@ import React from 'react'; ...@@ -3,10 +3,10 @@ import React from 'react';
import styles from './index.less'; import styles from './index.less';
const Field = ({ label, value, ...rest }) => ( const Field = ({ label, value, ...rest }) => (
<p className={styles.field} {...rest}> <div className={styles.field} {...rest}>
<span>{label}</span> <span>{label}</span>
<span>{value}</span> <span>{value}</span>
</p> </div>
); );
export default Field; export default Field;
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
white-space: nowrap; white-space: nowrap;
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
margin: 0;
span { span {
font-size: @font-size-base; font-size: @font-size-base;
line-height: 22px; line-height: 22px;
......
...@@ -219,7 +219,7 @@ class Pie extends Component { ...@@ -219,7 +219,7 @@ class Pie extends Component {
{subTitle && <h4 className="pie-sub-title">{subTitle}</h4>} {subTitle && <h4 className="pie-sub-title">{subTitle}</h4>}
{ {
// eslint-disable-next-line // eslint-disable-next-line
total && <p className="pie-stat" dangerouslySetInnerHTML={{ __html: total }} /> total && <div className="pie-stat" dangerouslySetInnerHTML={{ __html: total }} />
} }
</div> </div>
) )
......
...@@ -15,6 +15,8 @@ ...@@ -15,6 +15,8 @@
top: 50%; top: 50%;
transform: translateY(-50%); transform: translateY(-50%);
margin: 0 20px; margin: 0 20px;
list-style: none;
padding: 0;
li { li {
cursor: pointer; cursor: pointer;
margin-bottom: 16px; margin-bottom: 16px;
......
...@@ -9,12 +9,16 @@ ...@@ -9,12 +9,16 @@
cursor: pointer; cursor: pointer;
color: @text-color-secondary; color: @text-color-secondary;
line-height: 22px; line-height: 22px;
p {
margin: 0;
}
h6 { h6 {
color: @heading-color; color: @heading-color;
padding-left: 16px; padding-left: 16px;
font-size: 24px; font-size: 24px;
line-height: 32px; line-height: 32px;
margin-top: 4px; margin-top: 4px;
margin-bottom: 0;
} }
&:after { &:after {
background-color: @border-color-split; background-color: @border-color-split;
......
...@@ -60,9 +60,9 @@ class StandardTable extends PureComponent { ...@@ -60,9 +60,9 @@ class StandardTable extends PureComponent {
dataIndex: 'callNo', dataIndex: 'callNo',
sorter: true, sorter: true,
render: val => ( render: val => (
<p style={{ textAlign: 'center' }}> <div style={{ textAlign: 'center' }}>
{val} {val}
</p> </div>
), ),
}, },
{ {
...@@ -99,11 +99,11 @@ class StandardTable extends PureComponent { ...@@ -99,11 +99,11 @@ class StandardTable extends PureComponent {
{ {
title: '操作', title: '操作',
render: () => ( render: () => (
<p> <div>
<a href="">配置</a> <a href="">配置</a>
<span className={styles.splitLine} /> <span className={styles.splitLine} />
<a href="">订阅警报</a> <a href="">订阅警报</a>
</p> </div>
), ),
}, },
]; ];
...@@ -127,11 +127,11 @@ class StandardTable extends PureComponent { ...@@ -127,11 +127,11 @@ class StandardTable extends PureComponent {
<div className={styles.tableAlert}> <div className={styles.tableAlert}>
<Alert <Alert
message={( message={(
<p> <div>
已选择 <a style={{ fontWeight: 600 }}>{selectedRowKeys.length}</a> 项&nbsp;&nbsp; 已选择 <a style={{ fontWeight: 600 }}>{selectedRowKeys.length}</a> 项&nbsp;&nbsp;
服务调用总计 <span style={{ fontWeight: 600 }}>{totalCallNo}</span> 服务调用总计 <span style={{ fontWeight: 600 }}>{totalCallNo}</span>
<a onClick={this.cleanSelectedKeys} style={{ marginLeft: 24 }}>清空</a> <a onClick={this.cleanSelectedKeys} style={{ marginLeft: 24 }}>清空</a>
</p> </div>
)} )}
type="info" type="info"
showIcon showIcon
......
@import '~antd/lib/style/v2-compatible-reset.less';
html, body, :global(#root) { html, body, :global(#root) {
height: 100%; height: 100%;
} }
......
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
display: inline-block; display: inline-block;
vertical-align: middle; vertical-align: middle;
font-size: 20px; font-size: 20px;
margin-left: 12px; margin: 0 0 0 12px;
font-family: 'Myriad Pro', 'Helvetica Neue', Arial, Helvetica, sans-serif; font-family: 'Myriad Pro', 'Helvetica Neue', Arial, Helvetica, sans-serif;
font-weight: 600; font-weight: 600;
} }
......
...@@ -50,7 +50,7 @@ class UserLayout extends React.PureComponent { ...@@ -50,7 +50,7 @@ class UserLayout extends React.PureComponent {
<span className={styles.title}>Ant Design</span> <span className={styles.title}>Ant Design</span>
</Link> </Link>
</div> </div>
<p className={styles.desc}>Ant Design 是西湖区最具影响力的 Web 设计规范</p> <div className={styles.desc}>Ant Design 是西湖区最具影响力的 Web 设计规范</div>
</div> </div>
{ {
getRouteData('UserLayout').map(item => getRouteData('UserLayout').map(item =>
......
...@@ -14,7 +14,9 @@ ...@@ -14,7 +14,9 @@
} }
.rankingList { .rankingList {
margin-top: 25px; margin: 25px 0 0;
padding: 0;
list-style: none;
li { li {
.clearfix(); .clearfix();
margin-top: 16px; margin-top: 16px;
......
...@@ -142,8 +142,8 @@ export default class Workplace extends PureComponent { ...@@ -142,8 +142,8 @@ export default class Workplace extends PureComponent {
<Avatar size="large" src="https://gw.alipayobjects.com/zos/rmsportal/lctvVCLfRpYCkYxAsiVQ.png" /> <Avatar size="large" src="https://gw.alipayobjects.com/zos/rmsportal/lctvVCLfRpYCkYxAsiVQ.png" />
</div> </div>
<div className={styles.content}> <div className={styles.content}>
<p className={styles.contentTitle}>早安曲丽丽祝你开心每一天</p> <div className={styles.contentTitle}>早安曲丽丽祝你开心每一天</div>
<p>交互专家 | 蚂蚁金服某某某事业群某某平台部某某技术部UED</p> <div>交互专家 | 蚂蚁金服某某某事业群某某平台部某某技术部UED</div>
</div> </div>
</div> </div>
); );
......
...@@ -57,6 +57,7 @@ ...@@ -57,6 +57,7 @@
color: @heading-color; color: @heading-color;
font-size: 30px; font-size: 30px;
line-height: 38px; line-height: 38px;
margin: 0;
& > span { & > span {
color: @text-color-secondary; color: @text-color-secondary;
font-size: 20px; font-size: 20px;
......
...@@ -61,6 +61,7 @@ ...@@ -61,6 +61,7 @@
} }
& > p { & > p {
margin-top: 4px; margin-top: 4px;
margin-bottom: 0;
line-height: 22px; line-height: 22px;
} }
} }
......
...@@ -27,6 +27,7 @@ ...@@ -27,6 +27,7 @@
p { p {
line-height: 32px; line-height: 32px;
font-size: 24px; font-size: 24px;
margin: 0;
} }
p:first-child { p:first-child {
color: @text-color-secondary; color: @text-color-secondary;
......
...@@ -107,7 +107,7 @@ export default class SearchList extends Component { ...@@ -107,7 +107,7 @@ export default class SearchList extends Component {
const ListContent = ({ data: { content, updatedAt, avatar, owner, href } }) => ( const ListContent = ({ data: { content, updatedAt, avatar, owner, href } }) => (
<div className={styles.listContent}> <div className={styles.listContent}>
<p className={styles.description}>{content}</p> <div className={styles.description}>{content}</div>
<div className={styles.extra}> <div className={styles.extra}>
<Avatar src={avatar} size="small" /><a href={href}>{owner}</a> 发布在 <a href={href}>{href}</a> <Avatar src={avatar} size="small" /><a href={href}>{owner}</a> 发布在 <a href={href}>{href}</a>
<em>{moment(updatedAt).format('YYYY-MM-DD hh:mm')}</em> <em>{moment(updatedAt).format('YYYY-MM-DD hh:mm')}</em>
......
...@@ -92,7 +92,7 @@ const popoverContent = ( ...@@ -92,7 +92,7 @@ const popoverContent = (
<span className={styles.textSecondary} style={{ float: 'right' }}> <span className={styles.textSecondary} style={{ float: 'right' }}>
<Badge status="default" text={<span style={{ color: 'rgba(0, 0, 0, 0.45)' }}>未响应</span>} /> <Badge status="default" text={<span style={{ color: 'rgba(0, 0, 0, 0.45)' }}>未响应</span>} />
</span> </span>
<p className={styles.textSecondary} style={{ marginTop: 4 }}>耗时2小时25分钟</p> <div className={styles.textSecondary} style={{ marginTop: 4 }}>耗时2小时25分钟</div>
</div> </div>
); );
......
...@@ -9,9 +9,9 @@ const { Option } = Select; ...@@ -9,9 +9,9 @@ const { Option } = Select;
const InputGroup = Input.Group; const InputGroup = Input.Group;
const passwordStatusMap = { const passwordStatusMap = {
ok: <p className={styles.success}>强度</p>, ok: <div className={styles.success}>强度</div>,
pass: <p className={styles.warning}>强度</p>, pass: <div className={styles.warning}>强度</div>,
pool: <p className={styles.error}>强度太短</p>, pool: <div className={styles.error}>强度太短</div>,
}; };
const passwordProgressMap = { const passwordProgressMap = {
...@@ -163,7 +163,7 @@ export default class Register extends Component { ...@@ -163,7 +163,7 @@ export default class Register extends Component {
<div style={{ padding: '4px 0' }}> <div style={{ padding: '4px 0' }}>
{passwordStatusMap[this.getPasswordStatus()]} {passwordStatusMap[this.getPasswordStatus()]}
{this.renderPasswordProgress()} {this.renderPasswordProgress()}
<p style={{ marginTop: 10 }}>请至少输入 6 个字符请不要使用容易被猜到的密码</p> <div style={{ marginTop: 10 }}>请至少输入 6 个字符请不要使用容易被猜到的密码</div>
</div> </div>
} }
overlayStyle={{ width: 240 }} overlayStyle={{ width: 240 }}
......
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