fe / YOHOBUYPC · Commits

Go to a project

Authored by Lynnic
Commit e276d0268a2e4b2ddc7b7dc85327d8d813cbb01f 2 parents 43454a81 3c8a4d01

Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into develop

Inline Side-by-side
Showing 2 changed files with 21 additions and 26 deletions
... ... @@ -37,14 +37,14 @@ $basicBtnC:#eb0313;
.column {
box-sizing: border-box;
padding: pxToRem(20px) pxToRem(12px);
width: 50%;
border-bottom: 1px solid #fff;
border-right: 1px solid #fff;
//width: 50%;
border-bottom: pxToRem(4px) solid #fff;
border-right: pxToRem(4px) solid #fff;
font-size: pxToRem(24px);
background-color: $tableCellC;
float: left;
display: flex;
align-items: center;
flex-basis: 49.9%;
}
}
}
... ...
... ... @@ -46,39 +46,34 @@
}
.detail {
.material-item{
position: relative;
min-height: pxToRem(136px);
margin: pxToRem(10px) 0;
text-align: center;
display: flex;
align-items: center;
@include flexbox((
display: flex,
align-items: center
));
// width: 100%;
// border-bottom:1px solid $borderC;
img {
//position:absolute;
//top:0;
//bottom:0;
//left:0;
//margin:auto;
//width: pxToRem(90px);
//height: auto;
//padding-right: pxToRem(20px);
margin: 0;
}
.material-image {
display: inline-block;
width: 23%;
@include flexbox((
display: flex,
flex-basis: 23%,
justify-content: center
));
}
.material-desc {
//padding-left:pxToRem(120px);
font-size: pxToRem(24px);
box-sizing: border-box;
text-align: left;
display: inline-block;
width: 75%;
padding-left: 2%;
height: auto;
line-height: pxToRem(40px);
line-height: pxToRem(38px);
color: #4b4b4b;
@include flexbox((
display: flex,
flex-basis: 76.9%
));
}
&:last-child{
border-bottom: none;
... ... @@ -152,7 +147,7 @@
width: pxToRem(70px);
margin-top: pxToRem(55px);
div{
height: pxToRem(55px);
height: pxToRem(55px);
.avatar {
display: inline-block;
width: pxToRem(40px);
... ...