fe / YOHOBUYWAP · Commits

Go to a project

Authored by Rock Zhang
Commit 0bf210a73286ca4018bfa378d8385d6c716f6b19 2 parents 2db64f88 a8f881cd

Merge branch 'beta/wap' of http://git.dev.yoho.cn/web/yohobuywap into develop/wap 

Conflicts:
	static/dist/myohobuy/1.3.17/index-debug.js
	static/dist/myohobuy/1.3.17/index.css
	static/dist/myohobuy/1.3.17/index.js
Inline Side-by-side
Showing 2 changed files with 48 additions and 33 deletions
This diff could not be displayed because it is too large.
.massage-page{
.massage-page {
margin-top: 16px;
padding-bottom: 24px;
.massage-list{
padding: 12px 16px 12px 24px;
border-bottom: 1px solid #F8F8F8;
.massage-list {
padding: 12px 18px 12px 24px;
border-bottom: 1px solid #f8f8f8;
position: relative;
overflow: hidden;
p{
font-size: 16px;
p {
font-size: 28px;
color: #222;
}
span{
font-size: 12px;
color: #999999;
span {
font-size: 24px;
color: #999;
}
i{
i {
position: absolute;
right: 24px;
right: 48px;
top: 24px;
color: #cccccc;
color: #ccc;
}
strong{
strong {
width: 8px;
height: 8px;
position: absolute;
left: 16px;
top: 40px;
background: #f00;
border-radius:50%;
border-radius: 50%;
}
}
.massage-main{
border-bottom: 1px solid #F8F8F8;
.massage-main {
border-bottom: 1px solid #f8f8f8;
padding: 12px;
margin-left: 10px;
margin-bottom: 10px;
h6{
h6 {
margin-bottom: 8px;
}
span{
span {
color: #656565;
}
}
.sale-btn{
.sale-btn {
background-color: #ea2622;
color: #fff;
padding: 5px 10px 5px 10px;
}
.coupon-item{
.coupon-item {
margin-left: 10px;
padding-bottom: 10px;
border-bottom: 1px solid #F8F8F8;
border-bottom: 1px solid #f8f8f8;
margin-top: 10px;
.coupon-img{
.coupon-img {
width: 128px;
height: auto;
overflow: hidden;
float: left;
margin-right: 16px;
img{
img {
width: 100%;
height: auto;
}
}
.coupon-info{
font-size: 22px;
span{
.coupon-info {
font-size: 24px;
span {
color: #f00;
}
}
.coupon-action{
.coupon-action {
width: 110px;
font-size: 12px;
font-size: 24px;
letter-spacing: 2px;
margin: 3px 0 0 0;
height: 35px;
... ... @@ -80,12 +94,13 @@
background: #ed0010;
text-align: center;
margin-left: 144px;
a{
a {
display: block;
color: #fff;
width: 100%;
height:100%;
width: 100%;
height: 100%;
}
}
}
}
\ No newline at end of file
}
... ...