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.
1 -.massage-page{ 1 +.massage-page {
2 margin-top: 16px; 2 margin-top: 16px;
3 padding-bottom: 24px; 3 padding-bottom: 24px;
4 - .massage-list{  
5 - padding: 12px 16px 12px 24px;  
6 - border-bottom: 1px solid #F8F8F8; 4 +
  5 + .massage-list {
  6 + padding: 12px 18px 12px 24px;
  7 + border-bottom: 1px solid #f8f8f8;
7 position: relative; 8 position: relative;
8 overflow: hidden; 9 overflow: hidden;
9 - p{  
10 - font-size: 16px; 10 +
  11 + p {
  12 + font-size: 28px;
11 color: #222; 13 color: #222;
12 } 14 }
13 - span{  
14 - font-size: 12px;  
15 - color: #999999; 15 +
  16 + span {
  17 + font-size: 24px;
  18 + color: #999;
16 } 19 }
17 - i{ 20 +
  21 + i {
18 position: absolute; 22 position: absolute;
19 - right: 24px; 23 + right: 48px;
20 top: 24px; 24 top: 24px;
21 - color: #cccccc; 25 + color: #ccc;
22 } 26 }
23 - strong{ 27 +
  28 + strong {
24 width: 8px; 29 width: 8px;
25 height: 8px; 30 height: 8px;
26 position: absolute; 31 position: absolute;
27 left: 16px; 32 left: 16px;
28 top: 40px; 33 top: 40px;
29 background: #f00; 34 background: #f00;
30 - border-radius:50%; 35 + border-radius: 50%;
31 } 36 }
32 } 37 }
33 - .massage-main{  
34 - border-bottom: 1px solid #F8F8F8; 38 +
  39 + .massage-main {
  40 + border-bottom: 1px solid #f8f8f8;
35 padding: 12px; 41 padding: 12px;
36 margin-left: 10px; 42 margin-left: 10px;
37 margin-bottom: 10px; 43 margin-bottom: 10px;
38 - h6{ 44 +
  45 + h6 {
39 margin-bottom: 8px; 46 margin-bottom: 8px;
40 } 47 }
41 - span{ 48 +
  49 + span {
42 color: #656565; 50 color: #656565;
43 } 51 }
44 -  
45 } 52 }
46 - .sale-btn{ 53 +
  54 + .sale-btn {
47 background-color: #ea2622; 55 background-color: #ea2622;
48 color: #fff; 56 color: #fff;
49 padding: 5px 10px 5px 10px; 57 padding: 5px 10px 5px 10px;
50 } 58 }
51 - .coupon-item{ 59 +
  60 + .coupon-item {
52 margin-left: 10px; 61 margin-left: 10px;
53 padding-bottom: 10px; 62 padding-bottom: 10px;
54 - border-bottom: 1px solid #F8F8F8; 63 + border-bottom: 1px solid #f8f8f8;
55 margin-top: 10px; 64 margin-top: 10px;
56 - .coupon-img{ 65 +
  66 + .coupon-img {
57 width: 128px; 67 width: 128px;
58 height: auto; 68 height: auto;
59 overflow: hidden; 69 overflow: hidden;
60 float: left; 70 float: left;
61 margin-right: 16px; 71 margin-right: 16px;
62 - img{ 72 +
  73 + img {
63 width: 100%; 74 width: 100%;
64 height: auto; 75 height: auto;
65 } 76 }
66 } 77 }
67 - .coupon-info{  
68 - font-size: 22px;  
69 - span{ 78 +
  79 + .coupon-info {
  80 + font-size: 24px;
  81 +
  82 + span {
70 color: #f00; 83 color: #f00;
71 } 84 }
72 } 85 }
73 - .coupon-action{ 86 +
  87 + .coupon-action {
74 width: 110px; 88 width: 110px;
75 - font-size: 12px; 89 + font-size: 24px;
76 letter-spacing: 2px; 90 letter-spacing: 2px;
77 margin: 3px 0 0 0; 91 margin: 3px 0 0 0;
78 height: 35px; 92 height: 35px;
@@ -80,12 +94,13 @@ @@ -80,12 +94,13 @@
80 background: #ed0010; 94 background: #ed0010;
81 text-align: center; 95 text-align: center;
82 margin-left: 144px; 96 margin-left: 144px;
83 - a{ 97 +
  98 + a {
84 display: block; 99 display: block;
85 color: #fff; 100 color: #fff;
86 - width: 100%;  
87 - height:100%; 101 + width: 100%;
  102 + height: 100%;
88 } 103 }
89 } 104 }
90 } 105 }
91 -}  
  106 +}