Authored by lore-w

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

... ... @@ -4,17 +4,17 @@
<img class="lazy pic" src="{{img}}" data-original="{{img}}" alt="{{title}}" style="display: inline;">
<span class="arrow-bottom girl-channel-arrow{{# channelType}}-{{.}}{{/ channelType}}"></span>
</a>
<span href="{{link}}" style="{{^ isVideo}}display:none;{{/ isVideo}}" target="_blank" class="video-icon" title="{{alt}}"></a>
<a href="{{link}}" style="{{^ isVideo}}display:none;{{/ isVideo}}" target="_blank" class="video-icon" title="{{alt}}"></a>
</span>
<span class="content-item-detail-subchannle" _time="{{time}}">
{{# channel}}
<a href="{{../channelLink}}">
{{.}}
<a href="{{link}}">
{{name}}
</a>&nbsp;/&nbsp;
{{/ channel}}
{{# subChannel}}
<a href="{{../subChannel}}">
{{.}}
<a href="{{link}}">
{{name}}
</a>&nbsp;/&nbsp;
{{/ subChannel}}
<span></span>
... ...
... ... @@ -7,10 +7,10 @@
<div class="item-text-area">
<span class="item-date" _time="{{time}}">
{{# channel}}
<a class="channel" href="{{../channelURL}}" target="_blank">{{.}}</a> /
<a class="channel" href="{{link}}" target="_blank">{{name}}</a> /
{{/ channel}}
{{# subChannel}}
<a class="channel" href="{{../subChannelLink}}" target="_blank">{{.}}</a> /
<a class="channel" href="{{link}}" target="_blank">{{name}}</a> /
{{/ subChannel}}
</span>
<a class="item-title" href="{{link}}" target="_blank" _title="{{title}}">{{title}}</a>
... ...