Merge branch 'develop' into test
Showing
11 changed files
with
37 additions
and
39 deletions
| @@ -5,14 +5,14 @@ | @@ -5,14 +5,14 @@ | ||
| 5 | 5 | ||
| 6 | <h3 class="share-h3">{{subTitle}}</h3> | 6 | <h3 class="share-h3">{{subTitle}}</h3> |
| 7 | 7 | ||
| 8 | - <p> | 8 | + <div class="author-channel"> |
| 9 | {{# author}} | 9 | {{# author}} |
| 10 | - <a style="text-decoration:underline;" class="detail_author" href="{{link}}" target="_blank">By {{name}}</a> | 10 | + <p><a class="detail_author" href="{{link}}" target="_blank">By {{name}}</a></p> |
| 11 | {{/ author}} | 11 | {{/ author}} |
| 12 | - {{# channel}}<a href="{{../channelLink}}">{{.}}</a> | {{/ channel}} | ||
| 13 | - {{# twoChannel}}<a href="{{../twoChannelLink}}">{{.}}</a> | {{/ twoChannel}} | 12 | + {{# channel}}<a href="{{link}}">{{name}}</a> | {{/ channel}} |
| 13 | + {{# twoChannel}}<a href="{{link}}">{{name}}</a> | {{/ twoChannel}} | ||
| 14 | <span time="{{time}}" class="time-format"></span> | 14 | <span time="{{time}}" class="time-format"></span> |
| 15 | - </p> | 15 | + </div> |
| 16 | 16 | ||
| 17 | <div class="media"> | 17 | <div class="media"> |
| 18 | {{# coverSwiper}} | 18 | {{# coverSwiper}} |
| @@ -56,7 +56,7 @@ | @@ -56,7 +56,7 @@ | ||
| 56 | <ul> | 56 | <ul> |
| 57 | {{# tagItem}} | 57 | {{# tagItem}} |
| 58 | <li> | 58 | <li> |
| 59 | - <a style="text-decoration:underline;" href="{{link}}" target="_blank">{{name}}</a> | 59 | + <p><a href="{{link}}" target="_blank">{{name}}</a></p> |
| 60 | </li> | 60 | </li> |
| 61 | {{/ tagItem}} | 61 | {{/ tagItem}} |
| 62 | </ul> | 62 | </ul> |
| @@ -5,14 +5,14 @@ | @@ -5,14 +5,14 @@ | ||
| 5 | 5 | ||
| 6 | <h3 class="share-h3">{{subTitle}}</h3> | 6 | <h3 class="share-h3">{{subTitle}}</h3> |
| 7 | 7 | ||
| 8 | - <p> | 8 | + <div class="author-channel"> |
| 9 | {{# author}} | 9 | {{# author}} |
| 10 | - <a style="text-decoration:underline;" class="detail_author" href="{{link}}" target="_blank">By {{name}}</a> | 10 | + <p><a class="detail_author" href="{{link}}" target="_blank">By {{name}}</a></p> |
| 11 | {{/ author}} | 11 | {{/ author}} |
| 12 | - {{# channel}}<a href="{{../channelLink}}">{{.}}</a> | {{/ channel}} | ||
| 13 | - {{# twoChannel}}<a href="{{../twoChannelLink}}">{{.}}</a> | {{/ twoChannel}} | 12 | + {{# channel}}<a href="{{link}}">{{name}}</a> | {{/ channel}} |
| 13 | + {{# twoChannel}}<a href="{{link}}">{{name}}</a> | {{/ twoChannel}} | ||
| 14 | <span time="{{time}}" class="time-format"></span> | 14 | <span time="{{time}}" class="time-format"></span> |
| 15 | - </p> | 15 | + </div> |
| 16 | 16 | ||
| 17 | <div class="media"> | 17 | <div class="media"> |
| 18 | {{# coverSwiper}} | 18 | {{# coverSwiper}} |
| @@ -56,7 +56,7 @@ | @@ -56,7 +56,7 @@ | ||
| 56 | <ul> | 56 | <ul> |
| 57 | {{# tagItem}} | 57 | {{# tagItem}} |
| 58 | <li> | 58 | <li> |
| 59 | - <a style="text-decoration:underline;" href="{{link}}" target="_blank">{{name}}</a> | 59 | + <p><a href="{{link}}" target="_blank">{{name}}</a></p> |
| 60 | </li> | 60 | </li> |
| 61 | {{/ tagItem}} | 61 | {{/ tagItem}} |
| 62 | </ul> | 62 | </ul> |
| @@ -5,7 +5,7 @@ | @@ -5,7 +5,7 @@ | ||
| 5 | <ul> | 5 | <ul> |
| 6 | {{#content}} | 6 | {{#content}} |
| 7 | <li class="content-item channel-{{channelType}}"> | 7 | <li class="content-item channel-{{channelType}}"> |
| 8 | - <a class="img-link" href="{{link}}" target="_blank"> | 8 | + <a class="img-link {{# isVideo}}is-video{{/ isVideo}}" href="{{link}}" target="_blank"> |
| 9 | <img class="lazy" data-original="{{img}}" src="data:image/gif;base64,R0lGODlhAQABAJEAAAAAAP///93d3f///yH5BAEAAAMALAAAAAABAAEAAAICVAEAOw==" alt=""/> | 9 | <img class="lazy" data-original="{{img}}" src="data:image/gif;base64,R0lGODlhAQABAJEAAAAAAP///93d3f///yH5BAEAAAMALAAAAAABAAEAAAICVAEAOw==" alt=""/> |
| 10 | <a class="sub-tag" href="{{subChannelLink}}">{{subChannel}}</a> | 10 | <a class="sub-tag" href="{{subChannelLink}}">{{subChannel}}</a> |
| 11 | </a> | 11 | </a> |
| @@ -18,8 +18,8 @@ | @@ -18,8 +18,8 @@ | ||
| 18 | <a href="{{link}}" target="_blank">{{subTitle}}</a> | 18 | <a href="{{link}}" target="_blank">{{subTitle}}</a> |
| 19 | </h3> | 19 | </h3> |
| 20 | <time> | 20 | <time> |
| 21 | - {{# channel}}<a href="{{../channelLink}}">{{.}}</a> | {{/ channel}} | ||
| 22 | - {{# subChannel}}<a href="{{../subChannelLink}}">{{.}}</a> | {{/ subChannel}} | 21 | + {{# channel}}<a href="{{link}}">{{name}}</a> | {{/ channel}} |
| 22 | + {{# subChannel}}<a href="{{link}}">{{name}}</a> | {{/ subChannel}} | ||
| 23 | <span time="{{time}}" class="time-format"></span> | 23 | <span time="{{time}}" class="time-format"></span> |
| 24 | </time> | 24 | </time> |
| 25 | <p> | 25 | <p> |
| @@ -5,7 +5,7 @@ | @@ -5,7 +5,7 @@ | ||
| 5 | <ul> | 5 | <ul> |
| 6 | {{#content}} | 6 | {{#content}} |
| 7 | <li class="content-item channel-{{channelType}}"> | 7 | <li class="content-item channel-{{channelType}}"> |
| 8 | - <a class="img-link" href="{{link}}" target="_blank"> | 8 | + <a class="img-link {{# isVideo}}is-video{{/ isVideo}}" href="{{link}}" target="_blank"> |
| 9 | <img class="lazy" data-original="{{img}}" src="data:image/gif;base64,R0lGODlhAQABAJEAAAAAAP///93d3f///yH5BAEAAAMALAAAAAABAAEAAAICVAEAOw==" alt=""/> | 9 | <img class="lazy" data-original="{{img}}" src="data:image/gif;base64,R0lGODlhAQABAJEAAAAAAP///93d3f///yH5BAEAAAMALAAAAAABAAEAAAICVAEAOw==" alt=""/> |
| 10 | <a class="sub-tag" href="{{subChannelLink}}">{{subChannel}}</a> | 10 | <a class="sub-tag" href="{{subChannelLink}}">{{subChannel}}</a> |
| 11 | </a> | 11 | </a> |
| @@ -18,8 +18,8 @@ | @@ -18,8 +18,8 @@ | ||
| 18 | <a href="{{link}}" target="_blank">{{subTitle}}</a> | 18 | <a href="{{link}}" target="_blank">{{subTitle}}</a> |
| 19 | </h3> | 19 | </h3> |
| 20 | <time> | 20 | <time> |
| 21 | - {{# channel}}<a href="{{../channelLink}}">{{.}}</a> | {{/ channel}} | ||
| 22 | - {{# subChannel}}<a href="{{../subChannelLink}}">{{.}}</a> | {{/ subChannel}} | 21 | + {{# channel}}<a href="{{link}}">{{name}}</a> | {{/ channel}} |
| 22 | + {{# subChannel}}<a href="{{link}}">{{name}}</a> | {{/ subChannel}} | ||
| 23 | <span time="{{time}}" class="time-format"></span> | 23 | <span time="{{time}}" class="time-format"></span> |
| 24 | </time> | 24 | </time> |
| 25 | <p> | 25 | <p> |
| @@ -25,8 +25,8 @@ | @@ -25,8 +25,8 @@ | ||
| 25 | <a href="{{link}}" target="_blank">{{subTitle}}</a> | 25 | <a href="{{link}}" target="_blank">{{subTitle}}</a> |
| 26 | </h3> | 26 | </h3> |
| 27 | <time> | 27 | <time> |
| 28 | - {{# channel}}<a href="{{../channelLink}}">{{.}}</a> | {{/ channel}} | ||
| 29 | - {{# subChannel}}<a href="{{../subChannelLink}}">{{.}}</a> | {{/ subChannel}} | 28 | + {{# channel}}<a href="{{link}}">{{name}}</a> | {{/ channel}} |
| 29 | + {{# subChannel}}<a href="{{link}}">{{name}}</a> | {{/ subChannel}} | ||
| 30 | <span time="{{time}}" class="time-format"></span> | 30 | <span time="{{time}}" class="time-format"></span> |
| 31 | </time> | 31 | </time> |
| 32 | <p> | 32 | <p> |
| @@ -46,8 +46,8 @@ | @@ -46,8 +46,8 @@ | ||
| 46 | <a href="{{link}}" target="_blank">{{subTitle}}</a> | 46 | <a href="{{link}}" target="_blank">{{subTitle}}</a> |
| 47 | </h3> | 47 | </h3> |
| 48 | <time> | 48 | <time> |
| 49 | - {{# channel}}<a href="{{../channelLink}}">{{.}}</a> | {{/ channel}} | ||
| 50 | - {{# subChannel}}<a href="{{../subChannelLink}}">{{.}}</a> | {{/ subChannel}} | 49 | + {{# channel}}<a href="{{link}}">{{name}}</a> | {{/ channel}} |
| 50 | + {{# subChannel}}<a href="{{link}}">{{name}}</a> | {{/ subChannel}} | ||
| 51 | <span time="{{time}}" class="time-format"></span> | 51 | <span time="{{time}}" class="time-format"></span> |
| 52 | </time> | 52 | </time> |
| 53 | <p> | 53 | <p> |
| @@ -25,8 +25,8 @@ | @@ -25,8 +25,8 @@ | ||
| 25 | <a href="{{link}}" target="_blank">{{subTitle}}</a> | 25 | <a href="{{link}}" target="_blank">{{subTitle}}</a> |
| 26 | </h3> | 26 | </h3> |
| 27 | <time> | 27 | <time> |
| 28 | - {{# channel}}<a href="{{../channelLink}}">{{.}}</a> | {{/ channel}} | ||
| 29 | - {{# subChannel}}<a href="{{../subChannelLink}}">{{.}}</a> | {{/ subChannel}} | 28 | + {{# channel}}<a href="{{link}}">{{name}}</a> | {{/ channel}} |
| 29 | + {{# subChannel}}<a href="{{link}}">{{name}}</a> | {{/ subChannel}} | ||
| 30 | <span time="{{time}}" class="time-format"></span> | 30 | <span time="{{time}}" class="time-format"></span> |
| 31 | </time> | 31 | </time> |
| 32 | <p> | 32 | <p> |
| @@ -46,8 +46,8 @@ | @@ -46,8 +46,8 @@ | ||
| 46 | <a href="{{link}}" target="_blank">{{subTitle}}</a> | 46 | <a href="{{link}}" target="_blank">{{subTitle}}</a> |
| 47 | </h3> | 47 | </h3> |
| 48 | <time> | 48 | <time> |
| 49 | - {{# channel}}<a href="{{../channelLink}}">{{.}}</a> | {{/ channel}} | ||
| 50 | - {{# subChannel}}<a href="{{../subChannelLink}}">{{.}}</a> | {{/ subChannel}} | 49 | + {{# channel}}<a href="{{link}}">{{name}}</a> | {{/ channel}} |
| 50 | + {{# subChannel}}<a href="{{link}}">{{name}}</a> | {{/ subChannel}} | ||
| 51 | <span time="{{time}}" class="time-format"></span> | 51 | <span time="{{time}}" class="time-format"></span> |
| 52 | </time> | 52 | </time> |
| 53 | <p> | 53 | <p> |
| @@ -12,7 +12,7 @@ | @@ -12,7 +12,7 @@ | ||
| 12 | <p _title="{{introduce}}">{{introduce}}</p> | 12 | <p _title="{{introduce}}">{{introduce}}</p> |
| 13 | <span class="line-btn"></span> | 13 | <span class="line-btn"></span> |
| 14 | </div> | 14 | </div> |
| 15 | - <span class="comment_button"><b class="comment-num edit-comment"></b></span> | 15 | + <div class="comment_button"><b class="comment-num edit-comment">留言</b></div> |
| 16 | </div> | 16 | </div> |
| 17 | 17 | ||
| 18 | </div> | 18 | </div> |
| @@ -22,7 +22,6 @@ | @@ -22,7 +22,6 @@ | ||
| 22 | {{/ hasComment}} | 22 | {{/ hasComment}} |
| 23 | {{> common/comment_publish320}} | 23 | {{> common/comment_publish320}} |
| 24 | {{> common/comment320}} | 24 | {{> common/comment320}} |
| 25 | -{{> common/third_login320}} | ||
| 26 | <!--content--> | 25 | <!--content--> |
| 27 | <div class="home-content"> | 26 | <div class="home-content"> |
| 28 | <ul> | 27 | <ul> |
| @@ -12,7 +12,7 @@ | @@ -12,7 +12,7 @@ | ||
| 12 | <p _title="{{introduce}}">{{introduce}}</p> | 12 | <p _title="{{introduce}}">{{introduce}}</p> |
| 13 | <span class="line-btn"></span> | 13 | <span class="line-btn"></span> |
| 14 | </div> | 14 | </div> |
| 15 | - <span class="comment_button"><b class="comment-num edit-comment"></b></span> | 15 | + <div class="comment_button"><b class="comment-num edit-comment">留言</b></div> |
| 16 | </div> | 16 | </div> |
| 17 | 17 | ||
| 18 | </div> | 18 | </div> |
| @@ -22,7 +22,6 @@ | @@ -22,7 +22,6 @@ | ||
| 22 | {{/ hasComment}} | 22 | {{/ hasComment}} |
| 23 | {{> common/comment_publish320}} | 23 | {{> common/comment_publish320}} |
| 24 | {{> common/comment320}} | 24 | {{> common/comment320}} |
| 25 | -{{> common/third_login320}} | ||
| 26 | <!--content--> | 25 | <!--content--> |
| 27 | <div class="home-content"> | 26 | <div class="home-content"> |
| 28 | <ul> | 27 | <ul> |
| @@ -10,8 +10,8 @@ | @@ -10,8 +10,8 @@ | ||
| 10 | <a href="{{link}}" target="_blank">{{subTitle}}</a> | 10 | <a href="{{link}}" target="_blank">{{subTitle}}</a> |
| 11 | </h3> | 11 | </h3> |
| 12 | <time> | 12 | <time> |
| 13 | - {{# channel}}<a href="{{../channelLink}}">{{.}}</a> | {{/ channel}} | ||
| 14 | - {{# subChannel}}<a href="{{../subChannelLink}}">{{.}}</a> | {{/ subChannel}} | 13 | + {{# channel}}<a href="{{link}}">{{name}}</a> | {{/ channel}} |
| 14 | + {{# subChannel}}<a href="{{link}}">{{name}}</a> | {{/ subChannel}} | ||
| 15 | <span time="{{time}}" class="time-format"></span> | 15 | <span time="{{time}}" class="time-format"></span> |
| 16 | </time> | 16 | </time> |
| 17 | <p> | 17 | <p> |
| @@ -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> / | 13 | </a> / |
| 14 | {{/ channel}} | 14 | {{/ channel}} |
| 15 | {{# subChannel}} | 15 | {{# subChannel}} |
| 16 | - <a href="{{../subChannel}}"> | ||
| 17 | - {{.}} | 16 | + <a href="{{link}}"> |
| 17 | + {{name}} | ||
| 18 | </a> / | 18 | </a> / |
| 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> |
-
Please register or login to post a comment