Authored by xuqi

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

Conflicts:
	mobile/layouts/layout.html
... ... @@ -36,6 +36,7 @@
seajs.use(['jquery/1.8.3/jquery-debug',
'yohobuy-mobile/1.0.0/public/js/article-type-three-debug',
'yohobuy-mobile/1.0.0/public/js/detail-debug'], function($, article, detail) {
$(".detail-container").show();
if (article) {
article.init();
}
... ... @@ -43,8 +44,6 @@
if(detail) {
detail.init();
}
$(".detail-container").show();
});
</script>
</html>
\ No newline at end of file
... ...
$hack_safair_begin:'[;';
$hack_safair_end:';]';
.related-post {
margin: 30rem / $pxConvertRem 0 0 0;
... ... @@ -28,10 +30,12 @@
span {
float: left;
width: 360rem / $pxConvertRem;
#{$hack_safair_begin}width: 360rem / $pxConvertRem#{$hack_safair_end};
margin: 20rem / $pxConvertRem 0 0 30rem / $pxConvertRem;
line-height: 45rem / $pxConvertRem;
color: #444;
font-size: 28rem / $pxConvertRem;
}
}
}
... ...