ued / yohogirls_mustache · Commits

Go to a project

Authored by happyhour7@163.com
Commit 97ca8cb8438fe4810045868d7effcc82a39ac9a3 2 parents 32458625 e1633c90

Merge branch 'develop' into test

Inline Side-by-side
Showing 11 changed files with 37 additions and 39 deletions
... ... @@ -5,14 +5,14 @@
<h3 class="share-h3">{{subTitle}}</h3>
<p>
<div class="author-channel">
{{# author}}
<a style="text-decoration:underline;" class="detail_author" href="{{link}}" target="_blank">By&nbsp;{{name}}</a>
<p><a class="detail_author" href="{{link}}" target="_blank">By&nbsp;{{name}}</a></p>
{{/ author}}
{{# channel}}<a href="{{../channelLink}}">{{.}}</a>&nbsp;|&nbsp;{{/ channel}}
{{# twoChannel}}<a href="{{../twoChannelLink}}">{{.}}</a>&nbsp;|&nbsp;{{/ twoChannel}}
{{# channel}}<a href="{{link}}">{{name}}</a>&nbsp;|&nbsp;{{/ channel}}
{{# twoChannel}}<a href="{{link}}">{{name}}</a>&nbsp;|&nbsp;{{/ twoChannel}}
<span time="{{time}}" class="time-format"></span>
</p>
</div>
<div class="media">
{{# coverSwiper}}
... ... @@ -56,7 +56,7 @@
<ul>
{{# tagItem}}
<li>
<a style="text-decoration:underline;" href="{{link}}" target="_blank">{{name}}</a>
<p><a href="{{link}}" target="_blank">{{name}}</a></p>
</li>
{{/ tagItem}}
</ul>
... ...
... ... @@ -5,14 +5,14 @@
<h3 class="share-h3">{{subTitle}}</h3>
<p>
<div class="author-channel">
{{# author}}
<a style="text-decoration:underline;" class="detail_author" href="{{link}}" target="_blank">By&nbsp;{{name}}</a>
<p><a class="detail_author" href="{{link}}" target="_blank">By&nbsp;{{name}}</a></p>
{{/ author}}
{{# channel}}<a href="{{../channelLink}}">{{.}}</a>&nbsp;|&nbsp;{{/ channel}}
{{# twoChannel}}<a href="{{../twoChannelLink}}">{{.}}</a>&nbsp;|&nbsp;{{/ twoChannel}}
{{# channel}}<a href="{{link}}">{{name}}</a>&nbsp;|&nbsp;{{/ channel}}
{{# twoChannel}}<a href="{{link}}">{{name}}</a>&nbsp;|&nbsp;{{/ twoChannel}}
<span time="{{time}}" class="time-format"></span>
</p>
</div>
<div class="media">
{{# coverSwiper}}
... ... @@ -56,7 +56,7 @@
<ul>
{{# tagItem}}
<li>
<a style="text-decoration:underline;" href="{{link}}" target="_blank">{{name}}</a>
<p><a href="{{link}}" target="_blank">{{name}}</a></p>
</li>
{{/ tagItem}}
</ul>
... ...
... ... @@ -5,7 +5,7 @@
<ul>
{{#content}}
<li class="content-item channel-{{channelType}}">
<a class="img-link" href="{{link}}" target="_blank">
<a class="img-link {{# isVideo}}is-video{{/ isVideo}}" href="{{link}}" target="_blank">
<img class="lazy" data-original="{{img}}" src="data:image/gif;base64,R0lGODlhAQABAJEAAAAAAP///93d3f///yH5BAEAAAMALAAAAAABAAEAAAICVAEAOw==" alt=""/>
<a class="sub-tag" href="{{subChannelLink}}">{{subChannel}}</a>
</a>
... ... @@ -18,8 +18,8 @@
<a href="{{link}}" target="_blank">{{subTitle}}</a>
</h3>
<time>
{{# channel}}<a href="{{../channelLink}}">{{.}}</a>&nbsp;|&nbsp;{{/ channel}}
{{# subChannel}}<a href="{{../subChannelLink}}">{{.}}</a>&nbsp;|&nbsp;{{/ subChannel}}
{{# channel}}<a href="{{link}}">{{name}}</a>&nbsp;|&nbsp;{{/ channel}}
{{# subChannel}}<a href="{{link}}">{{name}}</a>&nbsp;|&nbsp;{{/ subChannel}}
<span time="{{time}}" class="time-format"></span>
</time>
<p>
... ...
... ... @@ -5,7 +5,7 @@
<ul>
{{#content}}
<li class="content-item channel-{{channelType}}">
<a class="img-link" href="{{link}}" target="_blank">
<a class="img-link {{# isVideo}}is-video{{/ isVideo}}" href="{{link}}" target="_blank">
<img class="lazy" data-original="{{img}}" src="data:image/gif;base64,R0lGODlhAQABAJEAAAAAAP///93d3f///yH5BAEAAAMALAAAAAABAAEAAAICVAEAOw==" alt=""/>
<a class="sub-tag" href="{{subChannelLink}}">{{subChannel}}</a>
</a>
... ... @@ -18,8 +18,8 @@
<a href="{{link}}" target="_blank">{{subTitle}}</a>
</h3>
<time>
{{# channel}}<a href="{{../channelLink}}">{{.}}</a>&nbsp;|&nbsp;{{/ channel}}
{{# subChannel}}<a href="{{../subChannelLink}}">{{.}}</a>&nbsp;|&nbsp;{{/ subChannel}}
{{# channel}}<a href="{{link}}">{{name}}</a>&nbsp;|&nbsp;{{/ channel}}
{{# subChannel}}<a href="{{link}}">{{name}}</a>&nbsp;|&nbsp;{{/ subChannel}}
<span time="{{time}}" class="time-format"></span>
</time>
<p>
... ...
... ... @@ -25,8 +25,8 @@
<a href="{{link}}" target="_blank">{{subTitle}}</a>
</h3>
<time>
{{# channel}}<a href="{{../channelLink}}">{{.}}</a>&nbsp;|&nbsp;{{/ channel}}
{{# subChannel}}<a href="{{../subChannelLink}}">{{.}}</a>&nbsp;|&nbsp;{{/ subChannel}}
{{# channel}}<a href="{{link}}">{{name}}</a>&nbsp;|&nbsp;{{/ channel}}
{{# subChannel}}<a href="{{link}}">{{name}}</a>&nbsp;|&nbsp;{{/ subChannel}}
<span time="{{time}}" class="time-format"></span>
</time>
<p>
... ... @@ -46,8 +46,8 @@
<a href="{{link}}" target="_blank">{{subTitle}}</a>
</h3>
<time>
{{# channel}}<a href="{{../channelLink}}">{{.}}</a>&nbsp;|&nbsp;{{/ channel}}
{{# subChannel}}<a href="{{../subChannelLink}}">{{.}}</a>&nbsp;|&nbsp;{{/ subChannel}}
{{# channel}}<a href="{{link}}">{{name}}</a>&nbsp;|&nbsp;{{/ channel}}
{{# subChannel}}<a href="{{link}}">{{name}}</a>&nbsp;|&nbsp;{{/ subChannel}}
<span time="{{time}}" class="time-format"></span>
</time>
<p>
... ...
... ... @@ -25,8 +25,8 @@
<a href="{{link}}" target="_blank">{{subTitle}}</a>
</h3>
<time>
{{# channel}}<a href="{{../channelLink}}">{{.}}</a>&nbsp;|&nbsp;{{/ channel}}
{{# subChannel}}<a href="{{../subChannelLink}}">{{.}}</a>&nbsp;|&nbsp;{{/ subChannel}}
{{# channel}}<a href="{{link}}">{{name}}</a>&nbsp;|&nbsp;{{/ channel}}
{{# subChannel}}<a href="{{link}}">{{name}}</a>&nbsp;|&nbsp;{{/ subChannel}}
<span time="{{time}}" class="time-format"></span>
</time>
<p>
... ... @@ -46,8 +46,8 @@
<a href="{{link}}" target="_blank">{{subTitle}}</a>
</h3>
<time>
{{# channel}}<a href="{{../channelLink}}">{{.}}</a>&nbsp;|&nbsp;{{/ channel}}
{{# subChannel}}<a href="{{../subChannelLink}}">{{.}}</a>&nbsp;|&nbsp;{{/ subChannel}}
{{# channel}}<a href="{{link}}">{{name}}</a>&nbsp;|&nbsp;{{/ channel}}
{{# subChannel}}<a href="{{link}}">{{name}}</a>&nbsp;|&nbsp;{{/ subChannel}}
<span time="{{time}}" class="time-format"></span>
</time>
<p>
... ...
... ... @@ -12,7 +12,7 @@
<p _title="{{introduce}}">{{introduce}}</p>
<span class="line-btn"></span>
</div>
<span class="comment_button"><b class="comment-num edit-comment"></b></span>
<div class="comment_button"><b class="comment-num edit-comment">留言</b></div>
</div>
</div>
... ... @@ -22,7 +22,6 @@
{{/ hasComment}}
{{> common/comment_publish320}}
{{> common/comment320}}
{{> common/third_login320}}
<!--content-->
<div class="home-content">
<ul>
... ...
... ... @@ -12,7 +12,7 @@
<p _title="{{introduce}}">{{introduce}}</p>
<span class="line-btn"></span>
</div>
<span class="comment_button"><b class="comment-num edit-comment"></b></span>
<div class="comment_button"><b class="comment-num edit-comment">留言</b></div>
</div>
</div>
... ... @@ -22,7 +22,6 @@
{{/ hasComment}}
{{> common/comment_publish320}}
{{> common/comment320}}
{{> common/third_login320}}
<!--content-->
<div class="home-content">
<ul>
... ...
... ... @@ -10,8 +10,8 @@
<a href="{{link}}" target="_blank">{{subTitle}}</a>
</h3>
<time>
{{# channel}}<a href="{{../channelLink}}">{{.}}</a>&nbsp;|&nbsp;{{/ channel}}
{{# subChannel}}<a href="{{../subChannelLink}}">{{.}}</a>&nbsp;|&nbsp;{{/ subChannel}}
{{# channel}}<a href="{{link}}">{{name}}</a>&nbsp;|&nbsp;{{/ channel}}
{{# subChannel}}<a href="{{link}}">{{name}}</a>&nbsp;|&nbsp;{{/ subChannel}}
<span time="{{time}}" class="time-format"></span>
</time>
<p>
... ...
... ... @@ -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>
... ...