fe / yohobuy-node · Commits

Go to a project

Authored by yyq
Commit 2710a4d8233dc4ac3dc13d099c991e68aad31dc1 2 parents 6a36d418 6deb6224

Merge branch 'release/4.6' of git.yoho.cn:fe/yohobuy-node into release/4.6

Inline Side-by-side
Showing 2 changed files with 100 additions and 45 deletions
... ... @@ -268,6 +268,8 @@
.sale-nav {
display: inline-block;
width: 100%;
height: 40px;
background-color: #f5f5f5;
}
li {
cursor: pointer;
... ... @@ -498,25 +500,16 @@
> .price {
margin-top: 5px;
text-align: left;
font-weight: bold;
}
.vip-center {
text-align: center;
font-weight: bold;
}
.brand {
display: none;
}
.sale-price {
margin-left: 30px;
}
.market-price {
text-decoration: line-through;
margin-left: 30px;
color: #444;
font-weight: bold;
}
... ... @@ -524,37 +517,41 @@
.vip-span {
background-repeat: no-repeat;
background-size: 100% 100%;
width: 20px;
height: 15px;
line-height: 15px;
line-height: 20px;
color: #fff;
font-style: italic;
margin-right: 5px;
margin-left: 10px;
margin-bottom: -3px;
padding-right: 5px;
padding-left: 5px;
margin-left: 10px;
display: inline-block;
}
.vip-tag {
background-image: resolve("sale/vip.png");
margin-left: 30px;
width: 20px;
height: 15px;
}
.vip-1 {
background-image: resolve("product/silver-small.png");
float: left;
margin-top: -3px;
background-image: resolve("product/silver.png");
margin-left: 30px;
width: 16px;
height: 16px;
}
.vip-2 {
background-image: resolve("product/golden-small.png");
float: left;
margin-top: -3px;
background-image: resolve("product/golden.png");
margin-left: 30px;
width: 16px;
height: 16px;
}
.vip-3 {
background-image: resolve("product/platinum-small.png");
float: left;
margin-top: -3px;
background-image: resolve("product/platinum.png");
margin-left: 30px;
width: 16px;
height: 16px;
}
}
}
... ... @@ -622,17 +619,79 @@
.good-info {
.good-detail-text {
> .price {
margin-top: 5px;
text-align: center;
text-align: left;
font-weight: bold;
}
.brand {
display: none;
}
.sale-price {
margin-left: 2px;
z-index: 1;
}
.market-price {
text-decoration: line-through;
margin-right: 15px;
margin-left: 0;
margin-right: 65px;
float: right;
color: #444;
font-weight: bold;
}
.vip-center {
text-align: center;
.market-price {
margin-left: 0;
}
.sale-price {
margin-left: 0;
}
}
.vip-span {
z-index: 100;
background-repeat: no-repeat;
background-size: 100% 100%;
width: 16px;
height: 16px;
line-height: 20px;
color: #fff;
font-style: italic;
margin-right: 5px;
padding-right: 5px;
padding-left: 5px;
margin-left: 10px;
}
.vip-tag {
background-image: resolve("sale/vip.png");
margin-left: 30px;
}
.vip-1 {
background-image: resolve("product/silver.png");
float: left;
margin-top: -3px;
margin-left: 0;
}
.vip-2 {
background-image: resolve("product/golden.png");
float: left;
margin-top: -3px;
margin-left: 0;
}
.vip-3 {
background-image: resolve("product/platinum.png");
float: left;
margin-top: -3px;
margin-left: 0;
}
}
}
}
... ...
... ... @@ -189,26 +189,12 @@
.good-info {
.good-detail-text {
> a {
margin-top: 16px;
line-height: 1.5;
display: block;
text-align: center;
font-weight: 600;
@mixin ellipsis;
}
> .price {
margin-top: 5px;
text-align: left;
font-weight: bold;
}
.vip-center {
text-align: center;
}
.brand {
display: none;
}
... ... @@ -224,12 +210,22 @@
font-weight: bold;
}
.vip-center {
text-align: center;
.market-price {
margin-left: 0;
}
.sale-price {
margin-left: 0;
}
}
.vip-span {
background-repeat: no-repeat;
background-size: 100% 100%;
width: 20px;
height: 15px;
line-height: 15px;
width: 16px;
height: 16px;
line-height: 20px;
color: #fff;
font-style: italic;
margin-right: 5px;
... ... @@ -245,17 +241,17 @@
}
.vip-1 {
background-image: resolve("product/silver-small.png");
background-image: resolve("product/silver.png");
float: left;
margin-top: -3px;
}
.vip-2 {
background-image: resolve("product/golden-small.png");
background-image: resolve("product/golden.png");
float: left;
margin-top: -3px;
}
.vip-3 {
background-image: resolve("product/platinum-small.png");
background-image: resolve("product/platinum.png");
float: left;
margin-top: -3px;
}
... ...