ued / yohogirls_mustache · Commits

Go to a project

Authored by lore-w
Commit 423b2cc19ef33ea4612b8adcf9fbb95cdc7b7cc3 2 parents 8314e142 e1633c90

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

Inline Side-by-side
Showing 2 changed files with 7 additions and 7 deletions
@@ -4,17 +4,17 @@ @@ -4,17 +4,17 @@
4 <img class="lazy pic" src="{{img}}" data-original="{{img}}" alt="{{title}}" style="display: inline;"> 4 <img class="lazy pic" src="{{img}}" data-original="{{img}}" alt="{{title}}" style="display: inline;">
5 <span class="arrow-bottom girl-channel-arrow{{# channelType}}-{{.}}{{/ channelType}}"></span> 5 <span class="arrow-bottom girl-channel-arrow{{# channelType}}-{{.}}{{/ channelType}}"></span>
6 </a> 6 </a>
7 - <span href="{{link}}" style="{{^ isVideo}}display:none;{{/ isVideo}}" target="_blank" class="video-icon" title="{{alt}}"></a> 7 + <a href="{{link}}" style="{{^ isVideo}}display:none;{{/ isVideo}}" target="_blank" class="video-icon" title="{{alt}}"></a>
8 </span> 8 </span>
9 <span class="content-item-detail-subchannle" _time="{{time}}"> 9 <span class="content-item-detail-subchannle" _time="{{time}}">
10 {{# channel}} 10 {{# channel}}
11 - <a href="{{../channelLink}}">  
12 - {{.}} 11 + <a href="{{link}}">
  12 + {{name}}
13 </a>&nbsp;/&nbsp; 13 </a>&nbsp;/&nbsp;
14 {{/ channel}} 14 {{/ channel}}
15 {{# subChannel}} 15 {{# subChannel}}
16 - <a href="{{../subChannel}}">  
17 - {{.}} 16 + <a href="{{link}}">
  17 + {{name}}
18 </a>&nbsp;/&nbsp; 18 </a>&nbsp;/&nbsp;
19 {{/ subChannel}} 19 {{/ subChannel}}
20 <span></span> 20 <span></span>
@@ -7,10 +7,10 @@ @@ -7,10 +7,10 @@
7 <div class="item-text-area"> 7 <div class="item-text-area">
8 <span class="item-date" _time="{{time}}"> 8 <span class="item-date" _time="{{time}}">
9 {{# channel}} 9 {{# channel}}
10 - <a class="channel" href="{{../channelURL}}" target="_blank">{{.}}</a> / 10 + <a class="channel" href="{{link}}" target="_blank">{{name}}</a> /
11 {{/ channel}} 11 {{/ channel}}
12 {{# subChannel}} 12 {{# subChannel}}
13 - <a class="channel" href="{{../subChannelLink}}" target="_blank">{{.}}</a> / 13 + <a class="channel" href="{{link}}" target="_blank">{{name}}</a> /
14 {{/ subChannel}} 14 {{/ subChannel}}
15 </span> 15 </span>
16 <a class="item-title" href="{{link}}" target="_blank" _title="{{title}}">{{title}}</a> 16 <a class="item-title" href="{{link}}" target="_blank" _title="{{title}}">{{title}}</a>