Merge remote-tracking branch 'origin/develop/wap' into beta/wap
Showing
2 changed files
with
3 additions
and
5 deletions
@@ -219,9 +219,9 @@ $yohoPage.on('touchstart', '.tap-hightlight', function() { | @@ -219,9 +219,9 @@ $yohoPage.on('touchstart', '.tap-hightlight', function() { | ||
219 | $(this).removeClass('highlight'); | 219 | $(this).removeClass('highlight'); |
220 | }); | 220 | }); |
221 | 221 | ||
222 | -// $('.nav-home').on('touchstart', function() { | ||
223 | -// $('.homebuttom').toggleClass('none'); | ||
224 | -// }); | 222 | +$('.nav-home').on('touchstart', function() { |
223 | + $('.homebuttom').toggleClass('none'); | ||
224 | +}); | ||
225 | 225 | ||
226 | (function() { | 226 | (function() { |
227 | var lastTime = 0, | 227 | var lastTime = 0, |
@@ -62,8 +62,6 @@ $border_color_light: #eee; | @@ -62,8 +62,6 @@ $border_color_light: #eee; | ||
62 | background-color: #fff; | 62 | background-color: #fff; |
63 | padding-left: 40rem / $pxConvertRem; | 63 | padding-left: 40rem / $pxConvertRem; |
64 | font-size: 40rem / $pxConvertRem; | 64 | font-size: 40rem / $pxConvertRem; |
65 | - color: #4f4f4f; | ||
66 | - | ||
67 | } | 65 | } |
68 | 66 | ||
69 | .detail { | 67 | .detail { |
-
Please register or login to post a comment