Commit 2618a582 authored by afc163's avatar afc163

update notice style

parent 5e27eba7
...@@ -56,8 +56,8 @@ export default { ...@@ -56,8 +56,8 @@ export default {
id: '000000009', id: '000000009',
title: '任务名称', title: '任务名称',
description: '任务需要在 2017-01-12 20:00 前启动', description: '任务需要在 2017-01-12 20:00 前启动',
extra: '马上到期', extra: '未开始',
status: 'urgent', status: 'todo',
type: '待办', type: '待办',
}, { }, {
id: '000000010', id: '000000010',
......
...@@ -29,7 +29,7 @@ export default function NoticeList({ ...@@ -29,7 +29,7 @@ export default function NoticeList({
className={styles.meta} className={styles.meta}
avatar={item.avatar ? <Avatar className={styles.avatar} src={item.avatar} /> : null} avatar={item.avatar ? <Avatar className={styles.avatar} src={item.avatar} /> : null}
title={ title={
<div> <div className={styles.title}>
{item.title} {item.title}
<div className={styles.extra}>{item.extra}</div> <div className={styles.extra}>{item.extra}</div>
</div> </div>
......
...@@ -16,6 +16,7 @@ ...@@ -16,6 +16,7 @@
.avatar { .avatar {
background: #fff; background: #fff;
margin-top: 4px;
} }
&.read { &.read {
...@@ -29,10 +30,7 @@ ...@@ -29,10 +30,7 @@
} }
.title { .title {
font-weight: normal; font-weight: normal;
color: @text-color; margin-bottom: 8px;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
} }
.description { .description {
font-size: 12px; font-size: 12px;
...@@ -48,6 +46,7 @@ ...@@ -48,6 +46,7 @@
color: @text-color-secondary; color: @text-color-secondary;
font-weight: normal; font-weight: normal;
margin-right: 0; margin-right: 0;
margin-top: -1.5px;
} }
} }
} }
......
...@@ -55,13 +55,13 @@ ReactDOM.render( ...@@ -55,13 +55,13 @@ ReactDOM.render(
list={noticeData['通知']} list={noticeData['通知']}
title="通知" title="通知"
emptyText="你已查看所有通知" emptyText="你已查看所有通知"
emptyImage="https://gw.alipayobjects.com/zos/rmsportal/sAuJeJzSKbUmHfBQRzmZ.svg" emptyImage="https://gw.alipayobjects.com/zos/rmsportal/wAhyIChODzsoKIOBHcBk.svg"
/> />
<NoticeIcon.Tab <NoticeIcon.Tab
list={noticeData['消息']} list={noticeData['消息']}
title="消息" title="消息"
emptyText="您已读完所有消息" emptyText="您已读完所有消息"
emptyImage="https://gw.alipayobjects.com/zos/rmsportal/wAhyIChODzsoKIOBHcBk.svg" emptyImage="https://gw.alipayobjects.com/zos/rmsportal/sAuJeJzSKbUmHfBQRzmZ.svg"
/> />
<NoticeIcon.Tab <NoticeIcon.Tab
list={noticeData['待办']} list={noticeData['待办']}
......
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
text-align: center; text-align: center;
} }
.ant-tabs-bar { .ant-tabs-bar {
margin-bottom: 0; margin-bottom: 4px;
} }
} }
} }
...@@ -122,9 +122,10 @@ class BasicLayout extends React.PureComponent { ...@@ -122,9 +122,10 @@ class BasicLayout extends React.PureComponent {
} }
if (newNotice.extra && newNotice.status) { if (newNotice.extra && newNotice.status) {
const color = ({ const color = ({
todo: '',
processing: 'blue', processing: 'blue',
urgent: 'red', urgent: 'red',
doing: 'yellow', doing: 'gold',
})[newNotice.status]; })[newNotice.status];
newNotice.extra = <Tag color={color}>{newNotice.extra}</Tag>; newNotice.extra = <Tag color={color}>{newNotice.extra}</Tag>;
} }
...@@ -243,13 +244,13 @@ class BasicLayout extends React.PureComponent { ...@@ -243,13 +244,13 @@ class BasicLayout extends React.PureComponent {
list={noticeData['通知']} list={noticeData['通知']}
title="通知" title="通知"
emptyText="你已查看所有通知" emptyText="你已查看所有通知"
emptyImage="https://gw.alipayobjects.com/zos/rmsportal/sAuJeJzSKbUmHfBQRzmZ.svg" emptyImage="https://gw.alipayobjects.com/zos/rmsportal/wAhyIChODzsoKIOBHcBk.svg"
/> />
<NoticeIcon.Tab <NoticeIcon.Tab
list={noticeData['消息']} list={noticeData['消息']}
title="消息" title="消息"
emptyText="您已读完所有消息" emptyText="您已读完所有消息"
emptyImage="https://gw.alipayobjects.com/zos/rmsportal/wAhyIChODzsoKIOBHcBk.svg" emptyImage="https://gw.alipayobjects.com/zos/rmsportal/sAuJeJzSKbUmHfBQRzmZ.svg"
/> />
<NoticeIcon.Tab <NoticeIcon.Tab
list={noticeData['待办']} list={noticeData['待办']}
......
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