Commit d05a69be authored by afc163's avatar afc163

Fix workplace style

parent 339ea67a
import React, { PureComponent, createElement } from 'react'; import React, { PureComponent, createElement } from 'react';
import PropTypes from 'prop-types'; import PropTypes from 'prop-types';
import { Button, Icon } from 'antd'; import { Button } from 'antd';
import styles from './index.less'; import styles from './index.less';
// TODO: 添加逻辑 // TODO: 添加逻辑
...@@ -32,8 +32,8 @@ class EditableLinkGroup extends PureComponent { ...@@ -32,8 +32,8 @@ class EditableLinkGroup extends PureComponent {
)) ))
} }
{ {
<Button size="small" onClick={onAdd}> <Button size="small" type="primary" ghost onClick={onAdd} icon="plus">
<Icon type="plus" />添加 添加
</Button> </Button>
} }
</div> </div>
......
...@@ -8,23 +8,9 @@ ...@@ -8,23 +8,9 @@
display: inline-block; display: inline-block;
font-size: @font-size-base; font-size: @font-size-base;
margin-bottom: 13px; margin-bottom: 13px;
margin-right: 32px; width: 25%;
&:hover { &:hover {
color: @primary-color; color: @primary-color;
} }
} }
& > button {
border-color: @primary-color;
color: @primary-color;
padding-left: 12px;
padding-right: 12px;
i {
position: relative;
top: -1px;
}
span {
position: relative;
top: -1px;
}
}
} }
...@@ -106,7 +106,7 @@ export default class Workplace extends PureComponent { ...@@ -106,7 +106,7 @@ export default class Workplace extends PureComponent {
const pageHeaderContent = ( const pageHeaderContent = (
<div className={styles.pageHeaderContent}> <div className={styles.pageHeaderContent}>
<div className={styles.avatar}> <div className={styles.avatar}>
<Avatar size="large" src="https://gw.alipayobjects.com/zos/rmsportal/XertDCubOxUvZbCdgWTW.png" /> <Avatar size="large" src="https://gw.alipayobjects.com/zos/rmsportal/TmNVmrOsXeZwnvvZMNmo.png" />
</div> </div>
<div className={styles.content}> <div className={styles.content}>
<p className={styles.contentTitle}>早安曲丽丽祝你开心每一天</p> <p className={styles.contentTitle}>早安曲丽丽祝你开心每一天</p>
...@@ -120,12 +120,10 @@ export default class Workplace extends PureComponent { ...@@ -120,12 +120,10 @@ export default class Workplace extends PureComponent {
<div> <div>
<p>项目数</p> <p>项目数</p>
<p>56</p> <p>56</p>
<em />
</div> </div>
<div> <div>
<p>团队内排名</p> <p>团队内排名</p>
<p>8<span> / 24</span></p> <p>8<span> / 24</span></p>
<em />
</div> </div>
<div> <div>
<p>项目访问</p> <p>项目访问</p>
...@@ -156,18 +154,20 @@ export default class Workplace extends PureComponent { ...@@ -156,18 +154,20 @@ export default class Workplace extends PureComponent {
<Card bodyStyle={{ padding: 0 }} bordered={false}> <Card bodyStyle={{ padding: 0 }} bordered={false}>
<Card.Meta <Card.Meta
title={( title={(
<span className={styles.cardTitle}> <div className={styles.cardTitle}>
<Avatar size="small" src={item.logo} /> <Avatar size="small" src={item.logo} />
<Link to={item.href}>{item.title}</Link> <Link to={item.href}>{item.title}</Link>
</span> </div>
)} )}
description={item.description} description={item.description}
/> />
<div className={styles.projectItemContent}> <div className={styles.projectItemContent}>
<Link to={item.memberLink}>{item.member || ''}</Link> <Link to={item.memberLink}>{item.member || ''}</Link>
{ {item.updatedAt && (
item.updatedAt && <span>{moment(item.updatedAt).fromNow()}</span> <span className={styles.datetime} title={item.updatedAt}>
} {moment(item.updatedAt).fromNow()}
</span>
)}
</div> </div>
</Card> </Card>
</Card.Grid> </Card.Grid>
...@@ -193,7 +193,11 @@ export default class Workplace extends PureComponent { ...@@ -193,7 +193,11 @@ export default class Workplace extends PureComponent {
<a style={{ fontWeight: 'bold' }}>{item.user.name}</a> 在 <a>xx</a> 新建了项目 <a>xxxx</a> <a style={{ fontWeight: 'bold' }}>{item.user.name}</a> 在 <a>xx</a> 新建了项目 <a>xxxx</a>
</p> </p>
} }
description={moment(item.updatedAt).fromNow()} description={
<span className={styles.datetime} title={item.updatedAt}>
{moment(item.updatedAt).fromNow()}
</span>
}
/> />
</List.Item> </List.Item>
)) ))
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
display: flex; display: flex;
.avatar { .avatar {
flex: 0 1 72px; flex: 0 1 72px;
margin-bottom: 12px; margin-bottom: 8px;
& > span { & > span {
border-radius: 72px; border-radius: 72px;
display: block; display: block;
...@@ -24,12 +24,14 @@ ...@@ -24,12 +24,14 @@
} }
.content { .content {
position: relative; position: relative;
top: 8px; top: 4px;
margin-left: 24px; margin-left: 24px;
flex: 1 1 auto; flex: 1 1 auto;
color: @text-color-secondary; color: @text-color-secondary;
line-height: 22px;
.contentTitle { .contentTitle {
font-size: 20px; font-size: 20px;
line-height: 28px;
font-weight: 500; font-weight: 500;
color: @heading-color; color: @heading-color;
margin-bottom: 12px; margin-bottom: 12px;
...@@ -40,7 +42,6 @@ ...@@ -40,7 +42,6 @@
.pageHeaderExtra { .pageHeaderExtra {
.clearfix(); .clearfix();
float: right; float: right;
margin-right: 8px;
& > div { & > div {
padding: 0 32px; padding: 0 32px;
position: relative; position: relative;
...@@ -60,17 +61,21 @@ ...@@ -60,17 +61,21 @@
font-size: 20px; font-size: 20px;
} }
} }
& > em { &:after {
background-color: @border-color-split; background-color: @border-color-split;
position: absolute; position: absolute;
top: 8px; top: 8px;
right: 0; right: 0;
width: 1px; width: 1px;
height: 40px; height: 40px;
content: '';
} }
} }
& > div:last-child { & > div:last-child {
padding-right: 0; padding-right: 0;
&:after {
display: none;
}
} }
} }
...@@ -111,20 +116,21 @@ ...@@ -111,20 +116,21 @@
:global { :global {
.ant-card-meta-description { .ant-card-meta-description {
color: @text-color-secondary; color: @text-color-secondary;
min-height: 42px; height: 44px;
line-height: 22px;
overflow: hidden;
} }
} }
.cardTitle { .cardTitle {
font-size: 14px; font-size: 0;
:global {
.ant-avatar {
position: relative;
top: 5px;
}
}
a { a {
color: @heading-color; color: @heading-color;
margin-left: 12px; margin-left: 12px;
line-height: 24px;
height: 24px;
display: inline-block;
vertical-align: top;
font-size: @font-size-base;
&:hover { &:hover {
color: @primary-color; color: @primary-color;
} }
...@@ -135,7 +141,7 @@ ...@@ -135,7 +141,7 @@
} }
.projectItemContent { .projectItemContent {
display: flex; display: flex;
margin-top: 12px; margin-top: 8px;
overflow: hidden; overflow: hidden;
font-size: 12px; font-size: 12px;
height: 20px; height: 20px;
...@@ -150,14 +156,18 @@ ...@@ -150,14 +156,18 @@
color: @primary-color; color: @primary-color;
} }
} }
span { .datetime {
color: @text-color-secondary; color: @disabled-color;
flex: 0 0 auto; flex: 0 0 auto;
float: right; float: right;
} }
} }
} }
.datetime {
color: @disabled-color;
}
@media screen and (max-width: @screen-xl) and (min-width: @screen-lg) { @media screen and (max-width: @screen-xl) and (min-width: @screen-lg) {
.activeCard { .activeCard {
margin-bottom: 24px; margin-bottom: 24px;
...@@ -186,7 +196,7 @@ ...@@ -186,7 +196,7 @@
& > div { & > div {
padding: 0 16px; padding: 0 16px;
text-align: left; text-align: left;
& > em { &:after {
display: none; display: none;
} }
} }
......
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