fe / YOHOBUYWAP · Commits

Go to a project

Authored by xuqi
Commit 38607004a9ab5befcbe6e28e5b837ce5ca44e037 2 parents 9580a091 d4093f0c

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

Inline Side-by-side
Showing 2 changed files with 34 additions and 22 deletions
... ... @@ -217,18 +217,19 @@ $basicBtnC:#eb0313;
height: auto;
li {
float: left;
img {
height: auto;
}
}
}
}
.goodsName {
box-sizing: border-box;
width: 100%;
min-height: pxToRem(88px);
font-size: pxToRem(28px);
color: #fff;
padding-left: pxToRem(28px);
padding-right: pxToRem(28px);
line-height: pxToRem(36px);
padding: pxToRem(20px) pxToRem(28px);
line-height: pxToRem(48px);
background-color: #515150;
}
.goodsSubtitle {
... ... @@ -287,14 +288,14 @@ $basicBtnC:#eb0313;
line-height: pxToRem(88px);
}
}
.goodsName {
// width: 100%;
display: table;
span {
display: table-cell;
vertical-align: middle;
}
}
// .goodsName {
// // width: 100%;
// display: table;
// span {
// display: table-cell;
// vertical-align: middle;
// }
// }
.vip-level {
box-sizing: box-border;
padding-left: pxToRem(28px);
... ... @@ -369,21 +370,28 @@ $basicBtnC:#eb0313;
}
}
.enter-store {
min-height: pxToRem(100px);
display: table;
position: relative;
padding: 0 pxToRem(180px) 0 pxToRem(114px);
line-height: pxToRem(84px);
background-color: #fff;
a {
display: table-cell;
vertical-align: middle;
text-align: left;
}
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
.store-logo {
// padding-right: 35rem/$pxConvertRem;
position: absolute;
left: 0;
top: 1px;
width: pxToRem(68px);
height: pxToRem(84px);
margin-left: pxToRem(30px);
font-size: 0;
text-align: center;
img {
display: inline-block;
width: auto;
height: pxToRem(68px);
margin-left: 0;
margin-right: pxToRem(-25px);
vertical-align: middle;
}
}
.store-name {
... ... @@ -391,6 +399,10 @@ $basicBtnC:#eb0313;
color: $mainFontC;
}
.store-link {
position: absolute;
right: 0;
top: 1px;
padding-right: pxToRem(30px);
font-size: pxToRem(28px);
color: $subFontC;
text-align: right;
... ...