fe / yohobuywap-node · Commits

Go to a project

Authored by 郭成尧
Commit 2dffb05b9859413a2e0b2da4753714da5b8e37f6 2 parents 2c27bf22 c542d031

Merge branch 'feature/coupon' into release/180420

Inline Side-by-side
Showing 2 changed files with 15 additions and 6 deletions
... ... @@ -128,7 +128,6 @@ body {
.coupon-left > p {
color: #fc5960;
font-size: 24px;
font-weight: 300;
> span {
font-size: 60px;
... ... @@ -143,7 +142,7 @@ body {
border-top-right-radius: 8px;
border-bottom-right-radius: 8px;
float: right;
padding: 12px 22px;
padding: 22px;
font-size: 22px;
color: #b0b0b0;
position: relative;
... ... @@ -176,6 +175,10 @@ body {
overflow: hidden;
}
.info > .title > .catalog-name {
font-weight: 500;
}
.info > .time {
position: absolute;
top: 50%;
... ... @@ -209,7 +212,7 @@ body {
}
.check > .icon-point1 {
color: #b0b0b0;
color: #e0e0e0;
}
}
... ... @@ -291,7 +294,7 @@ body {
width: 510px;
height: 100px;
float: left;
padding-right: 20px;
padding: 8px 20px;
}
.use-now-btn {
... ... @@ -306,7 +309,7 @@ body {
p {
font-size: 24px;
text-align: right;
line-height: 52px;
line-height: 46px;
}
.nums {
... ...
... ... @@ -68,6 +68,7 @@ body {
&.active {
background-color: #444;
color: #fff;
border: 1px solid transparent;
}
}
}
... ... @@ -128,7 +129,6 @@ body {
.coupon-left > p {
color: #fc5960;
font-size: 24px;
font-weight: 300;
> span {
font-size: 60px;
... ... @@ -173,6 +173,12 @@ body {
color: #b0b0b0;
position: relative;
.type-shop,
.type-activity,
.type-freight {
font-weight: 500;
}
.type-shop {
color: #efaf46;
}
... ...