fe / yohobuy-frontend · Commits

Go to a project

Authored by xuqi
Commit dfee1e8c1b7483c8401dfae4266df1e7d0f3dd33 2 parents 083c81b5 ff5ef974

Merge branch 'feature/h5detail' of git.dev.yoho.cn:web/yohobuy-frontend into feature/h5detail 

Conflicts:
	mobile/layouts/layout.html
Inline Side-by-side
Showing 2 changed files with 5 additions and 2 deletions
@@ -36,6 +36,7 @@ @@ -36,6 +36,7 @@
36 seajs.use(['jquery/1.8.3/jquery-debug', 36 seajs.use(['jquery/1.8.3/jquery-debug',
37 'yohobuy-mobile/1.0.0/public/js/article-type-three-debug', 37 'yohobuy-mobile/1.0.0/public/js/article-type-three-debug',
38 'yohobuy-mobile/1.0.0/public/js/detail-debug'], function($, article, detail) { 38 'yohobuy-mobile/1.0.0/public/js/detail-debug'], function($, article, detail) {
  39 + $(".detail-container").show();
39 if (article) { 40 if (article) {
40 article.init(); 41 article.init();
41 } 42 }
@@ -43,8 +44,6 @@ @@ -43,8 +44,6 @@
43 if(detail) { 44 if(detail) {
44 detail.init(); 45 detail.init();
45 } 46 }
46 -  
47 - $(".detail-container").show();  
48 }); 47 });
49 </script> 48 </script>
50 </html> 49 </html>
  1 +$hack_safair_begin:'[;';
  2 +$hack_safair_end:';]';
1 .related-post { 3 .related-post {
2 margin: 30rem / $pxConvertRem 0 0 0; 4 margin: 30rem / $pxConvertRem 0 0 0;
3 5
@@ -28,10 +30,12 @@ @@ -28,10 +30,12 @@
28 span { 30 span {
29 float: left; 31 float: left;
30 width: 360rem / $pxConvertRem; 32 width: 360rem / $pxConvertRem;
  33 + #{$hack_safair_begin}width: 360rem / $pxConvertRem#{$hack_safair_end};
31 margin: 20rem / $pxConvertRem 0 0 30rem / $pxConvertRem; 34 margin: 20rem / $pxConvertRem 0 0 30rem / $pxConvertRem;
32 line-height: 45rem / $pxConvertRem; 35 line-height: 45rem / $pxConvertRem;
33 color: #444; 36 color: #444;
34 font-size: 28rem / $pxConvertRem; 37 font-size: 28rem / $pxConvertRem;
  38 +
35 } 39 }
36 } 40 }
37 } 41 }