fe / YOHOBUYWAP · Commits

Go to a project

Authored by 梁志锋
Commit fa8c1a12534dfd6d346b7cc60f863b90023ce4e3 1 parent aa9e081b

update css

Inline Side-by-side
Showing 1 changed file with 11 additions and 138 deletions
... ... @@ -66,141 +66,6 @@ $basicBtnC:#eb0313;
background-color: $tableCellC;
}
}
<<<<<<< HEAD
}
}
.banner-swiper {
min-height: pxToRem(600px);
min-width: pxToRem(448px);
margin: pxToRem(30px) pxToRem(96px);
// position: relative;
overflow: hidden;
ul {
position: relative;
height: 100%;
li {
float: left;
height: 100%;
}
}
}
.goodsName {
box-sizing:border-box;
width: 100%;
min-height: pxToRem(83px);
font-size: pxToRem(28px);
color: #fff;
padding-left: pxToRem(25px);
padding-right: pxToRem(25px);
line-height: pxToRem(36px);
background-color: #515150;
}
.goodsSubtitle{
min-height: pxToRem(87px);
font-size: pxToRem(24px);
line-height: pxToRem(36px);
color:$subFontC;
padding-left:pxToRem(28px);
padding-right:pxToRem(28px);
border-bottom:1px solid $borderC;
background-color: #f4f4f4;
}
.price-date{
// width: 100%;
color:$subFontC;
min-height: pxToRem(88px);
padding-left:pxToRem(28px);
padding-right:pxToRem(28px);
border-bottom: 1px solid $borderC;
}
.goodsPrice{
float: left;
font-size: pxToRem(34.59px);
h1{
display: inline-block;
line-height: pxToRem(88px);
}
.currentPrice{
color:red;
margin-right: pxToRem(10px);
}
.previousPrice{
text-decoration:line-through;
}
}
.periodOfMarket{
font-size: pxToRem(24px);
float: right;
h1{
display: inline-block;
line-height: pxToRem(88px);
}
}
.goodsName,
.goodsSubtitle{
// width: 100%;
display:table;
span{
display: table-cell;
vertical-align: middle;
}
}
.vipLevel {
width: 100%;
box-sizing:border-box;
display: table;
min-height: pxToRem(88px);
padding-left:pxToRem(28px);
padding-right:pxToRem(28px);
font-size: pxToRem(22px);
color: #999999;
border-bottom: 1px solid $borderC;
span{
display: table-cell;
vertical-align: middle;
}
.vip-img{
padding-right: pxToRem(22px);
img{
width: pxToRem(52px);
height: pxToRem(32px);
}
&:nth-child(3n-3) {
background: image-url('product/silver.png') no-repeat;
}
&:nth-child(3n-2) {
background: image-url('product/golden.png') no-repeat;
}
&:nth-child(3n-1) {
background: image-url('product/platinum.png') no-repeat;
}
}
.vip-price{
padding-right: pxToRem(55px);
}
.vip-price:last-child{
padding-right: 0;
}
}
.goodsDiscount{
font-size: pxToRem(28px);
color: $mainFontC;
border-bottom: 1px solid $borderC;
h1{
padding : pxToRem(30px) pxToRem(28px);
=======
}
}
}
... ... @@ -270,7 +135,6 @@ $basicBtnC:#eb0313;
.goodsSubtitle {
min-height: pxToRem(87px);
font-size: pxToRem(24px);
>>>>>>> f57e2ffe1ca53fe633e327c2a34a6f34b887a7bd
line-height: pxToRem(36px);
color: $subFontC;
padding-left: pxToRem(28px);
... ... @@ -332,12 +196,21 @@ $basicBtnC:#eb0313;
display: table-cell;
vertical-align: middle;
}
.vip-img {
.vip-img{
padding-right: pxToRem(22px);
img {
img{
width: pxToRem(52px);
height: pxToRem(32px);
}
&:nth-child(3n-3) {
background: image-url('product/silver.png') no-repeat;
}
&:nth-child(3n-2) {
background: image-url('product/golden.png') no-repeat;
}
&:nth-child(3n-1) {
background: image-url('product/platinum.png') no-repeat;
}
}
.vip-price {
padding-right: pxToRem(55px);
... ...