Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev

This commit is contained in:
suxiaoxin 2017-09-15 19:58:57 +08:00
commit 49252e963a
2 changed files with 14 additions and 5 deletions

View File

@ -12,8 +12,15 @@
transform: translateY(-4px);
}
.m-card .ant-card-body {
background-color: $color-bg-gray;
box-shadow: 0 4px 8px rgba(50, 50, 93, 0.11), 0 4px 6px rgba(0, 0, 0, 0.08);
}
.card-btns .icon {
color: rgba(39, 56, 72, 0.85);
}
.card-btns .icon.active {
color: #fac200;
}
}
&:active {
.m-card, .card-btns {
@ -40,23 +47,25 @@
position: absolute;
right: 0;
top: 0;
color: #fff;
}
.icon.active {
color: #fac200;
color: #fff;
}
}
}
.m-card {
cursor: pointer;
text-align: center;
margin-bottom: .36rem;
margin-bottom: .16rem;
transition: all .4s;
position: relative;
.ant-card-body {
background-color: $color-bg-gray;
background-color: #fff;
border-radius: 4px;
padding-top: .24rem + .16rem + 1rem;
box-shadow: 0 4px 6px rgba(50,50,93,.11), 0 1px 3px rgba(0,0,0,.08);
box-shadow: 0 4px 6px rgba(255,255,255,.11), 0 1px 3px rgba(255,255,255,.08);
// box-shadow: 0 4px 6px rgba(50,50,93,.11), 0 1px 3px rgba(0,0,0,.08);
transition: all .2s;
}
.ui-logo {

View File

@ -120,7 +120,7 @@ class ProjectList extends Component {
<Row gutter={16}>
{projectData.length ? projectData.map((item, index) => {
return (
<Col span={8} key={index}>
<Col span={6} key={index}>
<ProjectCard projectData={item} callbackResult={this.receiveRes} />
</Col>);
}) : <ErrMsg type="noProject" />}