ued / yohogirls_mustache · Commits

Go to a project

Authored by happyhour7@163.com
Commit e1633c907a4775cd982f4068d0fb1191076543f1 2 parents 5d3f2365 c661516d

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

Inline Side-by-side
Showing 9 changed files with 30 additions and 32 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>
... ...