ued / yohogirls_mustache · Commits

Go to a project

Authored by lore-w
Commit 91a5331e0746fb78a34ad848982749c5d0019a9e 2 parents 94184e65 b5f215e4

Merge branch 'develop' of http://git.dev.yoho.cn/ued/yohogirls-mustache into develop

Inline Side-by-side
Showing 10 changed files with 18 additions and 10 deletions
... ... @@ -16,7 +16,7 @@
<div class="about-us-qr">
<div class="product girl clearfix">
<div class="product-wrap">
<img src="http://cmsres.test.yoho.cn/res/new/girls/assets/images/download_boy_icon.png" alt="">
<img src="http://cmsres.test.yoho.cn/res/new/girls/assets/images/about/download_boy_icon.png" alt="">
<span>YOHO!BOYS</span>
</div>
<div class="product-wrap product-wrap-right">
... ...
... ... @@ -16,7 +16,7 @@
<div class="about-us-qr">
<div class="product girl clearfix">
<div class="product-wrap">
<img src="http://cmsres.test.yoho.cn/res/new/girls/assets/images/download_boy_icon.png" alt="">
<img src="http://cmsres.test.yoho.cn/res/new/girls/assets/images/about/download_boy_icon.png" alt="">
<span>YOHO!BOYS</span>
</div>
<div class="product-wrap product-wrap-right">
... ...
... ... @@ -14,7 +14,7 @@
{{> detail/detail_text}}
{{/ content}}
{{> detail/detail_tag}}
{{> detail/detail_status}}
{{> detail/detail_status_hk}}
{{# commentParam}}
<div class="comments-box" cid="{{cid}}" cc="{{cc}}" ctype="{{ctype}}" ctwoc="{{ctwoc}}"></div>
{{/ commentParam}}
... ...
... ... @@ -3,7 +3,7 @@
<div class="follow-us">
<div class="title">
{{^ fanti}} 关注我们 {{/ fanti}}
{{# fanti}} Follow us {{/ fanti}}
{{# fanti}} 關注我們 {{/ fanti}}
</div>
<ul class="icons-content">
<li><a href="http://app.yohoshow.com" target="_blank" class="icons show" onclick="YOHODCLICK('follow','web','followShow')"></a></li>
... ...
<div class="follow-us-default">
<div class="title">
{{# fanti}} Follow us {{/ fanti}}
{{# fanti}} 關注我們 {{/ fanti}}
{{^ fanti}} 关注我们 {{/ fanti}}
</div>
<ul class="icons-content">
... ...
<div class="focus-us clearfix">
<h4>follow us</h4>
<h4>關注我們</h4>
<ul class="focuslist clearfix">
<li class="show"><a href="http://app.yohoshow.com" target="_blank"></a></li>
<li class="weibo"><a href="http://weibo.com/yohomedia" target="_blank"></a></li>
... ...
... ... @@ -10,7 +10,7 @@
<div class="detail-slide-ctrl">
<ul class="detail-slide-ctrl-tabs clearfix">
{{# smallImgList}}
<li><a href="javascript:;"><span class="border"></span><span class="arrow"></span><img class="lazy" data-original="{{src}}" alt=""></a></li>
<li><a href="javascript:;"><span class="border"></span><span class="arrow"></span><img src="{{src}}" alt=""></a></li>
{{/ smallImgList}}
</ul>
<a href="javascript:;" class="detail-slide-ctrl-prev"></a>
... ...
<div class="stats-btn clearfix">
<ul class="statslist clearfix">
<li class="wow"><a class="clearfix" href="javascript:;"><strong></strong><span></span></a></li>
<li class="zzz"><a class="clearfix" href="javascript:;"><strong></strong><span></span></a></li>
<li class="wtf"><a class="clearfix" href="javascript:;"><strong></strong><span></span></a></li>
<li class="comments hk"><a class="clearfix" href="javascript:;"><strong></strong><span class="comment-num"></span></a></li>
</ul>
</div>
\ No newline at end of file
... ...
... ... @@ -5,7 +5,7 @@
<p class="mags-text">《YOHO!潮流誌》是新力傳媒著重打造的媒體，也是目前最成熟的媒體之壹。他是第壹本內地編輯的屬於年輕人的潮流時尚雜誌，讀者受眾定位為16—30歲年輕人群，內容包括潮流服飾、原創品牌、明星娛樂、藝術設計、動漫影音等，將年輕人關註的方方面面壹網打盡。</p>
<div class="date-price">
<p><span>{{date}} </span> | {{title}}</p>
<p class="price">RMB15</p>
<p class="price">KD$ 20</p>
</div>
{{# buyUrl}}
<div class="mags-buy">
... ...
... ... @@ -6,7 +6,7 @@
detail.videoMiniPlayer();
// IPAD上面的视频处理
if (navigator.userAgent.indexOf("iPad") !== -1) {
/*if (navigator.userAgent.indexOf("iPad") !== -1) {
// 封面视频播放器替换为H5的VIDEO标签
if (!!$(".video-wrap").find("object").size()) {
$(".video-wrap").find("object").hide();
... ... @@ -35,7 +35,7 @@
$(this).replaceWith(videoHtml);
});
}
}
}*/
}
... ...