Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
Showing
3 changed files
with
7 additions
and
7 deletions
@@ -191,8 +191,8 @@ function getCouponDate() { | @@ -191,8 +191,8 @@ function getCouponDate() { | ||
191 | 191 | ||
192 | getCouponDate(); | 192 | getCouponDate(); |
193 | 193 | ||
194 | -$(window).scroll(function() { | ||
195 | - if ($(window).scrollTop() + $(window).height() > $('body').height() * 0.9) { | ||
196 | - getCouponDate(); | ||
197 | - } | ||
198 | -}); | 194 | +// $(window).scroll(function() { |
195 | +// if ($(window).scrollTop() + $(window).height() > $('body').height() * 0.9) { | ||
196 | +// getCouponDate(); | ||
197 | +// } | ||
198 | +// }); |
@@ -185,7 +185,7 @@ | @@ -185,7 +185,7 @@ | ||
185 | height: pxToRem(60px); | 185 | height: pxToRem(60px); |
186 | color: #444; | 186 | color: #444; |
187 | background: #efefef; | 187 | background: #efefef; |
188 | - font-size: pxToRem(16px); | 188 | + font-size: pxToRem(24px); |
189 | line-height: 1; | 189 | line-height: 1; |
190 | outline: 0; | 190 | outline: 0; |
191 | border: 0; | 191 | border: 0; |
@@ -61,7 +61,7 @@ | @@ -61,7 +61,7 @@ | ||
61 | position: relative; | 61 | position: relative; |
62 | margin-top: pxToRem(30px); | 62 | margin-top: pxToRem(30px); |
63 | margin-bottom: pxToRem(30px); | 63 | margin-bottom: pxToRem(30px); |
64 | - font-size: pxToRem(14px); | 64 | + font-size: pxToRem(28px); |
65 | line-height: 2; | 65 | line-height: 2; |
66 | color: #b0b0b0; | 66 | color: #b0b0b0; |
67 | text-align: center; | 67 | text-align: center; |
-
Please register or login to post a comment