Authored by ccbikai

Merge remote-tracking branch 'origin/feature/newlogo' into release/4.9.1.0

... ... @@ -13,7 +13,7 @@
<p class="good-tag sale-tag">SALE</p>
{{/ is_discount}}
{{# is_yohood}}
<div class="good-tag running-man-tag">跑男同款</div>
<p class="good-tag new-festival-tag">新品节</p>
{{/ is_yohood}}
{{# is_limited}}
<p class="good-tag limit-tag">限量商品</p>
... ...
... ... @@ -11,9 +11,9 @@
{{# isDiscount}}
<p class="good-tag sale-tag">SALE</p>
{{/ isDiscount}}
{{# isYohoood}}
<p class="good-tag running-man-tag">跑男同款</p>
{{/ isYohoood}}
{{# isYohood}}
<p class="good-tag new-festival-tag">新品节</p>
{{/ isYohood}}
{{# isLimited}}
<p class="good-tag limit-tag">限量商品</p>
{{/ isLimited}}
... ...
... ... @@ -43,9 +43,12 @@
}
.new-festival-tag {
width: 90px;
background-color: #000;
color: #fff;
color: #000;
width: 100px;
background-image: resolve("product/new-festival.png");
background-repeat: no-repeat;
background-color: #fff;
background-size: 100px 28px;
}
.limit-tag {
... ...
... ... @@ -156,8 +156,12 @@ $basicBtnC: #eb0313;
}
.new-festival-tag {
background-color: #000;
color: #fff;
color: #000;
width: 120px;
background-image: resolve("product/new-festival.png");
background-repeat: no-repeat;
background-color: #fff;
background-size: 120px 38px;
}
.yohood-tag {
... ...