Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

UX: moves topic-list excerpts out of category / tag div

This commit is contained in:
Joe 2019-01-08 14:55:15 +08:00 committed by GitHub
parent 4ebf170fe4
commit 3457395f75
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 22 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
app/assets/javascripts/discourse/templates/list/topic-list-item.raw.hbs
View File

@ -17,25 +17,25 @@
{{~raw "topic-status" topic=topic}} {{~raw "topic-status" topic=topic}}
{{~topic-link topic class="raw-link raw-topic-link"}} {{~topic-link topic class="raw-link raw-topic-link"}}
{{~#if topic.featured_link}} {{~#if topic.featured_link}}
{{~topic-featured-link topic}} {{~topic-featured-link topic}}
{{~/if}} {{~/if}}
{{~raw-plugin-outlet name="topic-list-after-title"}} {{~raw-plugin-outlet name="topic-list-after-title"}}
{{~#if showTopicPostBadges}} {{~#if showTopicPostBadges}}
{{~raw "topic-post-badges" unread=topic.unread newPosts=topic.displayNewPosts unseen=topic.unseen url=topic.lastUnreadUrl newDotText=newDotText}} {{~raw "topic-post-badges" unread=topic.unread newPosts=topic.displayNewPosts unseen=topic.unseen url=topic.lastUnreadUrl newDotText=newDotText}}
{{~/if}} {{~/if}}
</span> </span>
<div class="link-bottom-line"> <div class="link-bottom-line">
{{#unless hideCategory}} {{#unless hideCategory}}
{{#unless topic.isPinnedUncategorized}} {{#unless topic.isPinnedUncategorized}}
{{category-link topic.category}} {{category-link topic.category}}
{{/unless}}
{{/unless}} {{/unless}}
{{/unless}} {{discourse-tags topic mode="list" tagsForUser=tagsForUser}}
{{discourse-tags topic mode="list" tagsForUser=tagsForUser}} {{raw "list/action-list" topic=topic postNumbers=topic.liked_post_numbers className="likes" icon="heart"}}
</div>
{{#if expandPinned}} {{#if expandPinned}}
{{raw "list/topic-excerpt" topic=topic}} {{raw "list/topic-excerpt" topic=topic}}
{{/if}} {{/if}}
{{raw "list/action-list" topic=topic postNumbers=topic.liked_post_numbers className="likes" icon="heart"}}
</div>
</td> </td>
{{#if showPosters}} {{#if showPosters}}
@ -49,21 +49,21 @@
{{/if}} {{/if}}
{{#if showLikes}} {{#if showLikes}}
<td class="num likes"> <td class="num likes">
{{#if hasLikes}} {{#if hasLikes}}
<a href='{{topic.summaryUrl}}'> <a href='{{topic.summaryUrl}}'>
{{number topic.like_count}} {{d-icon "heart"}}</td> {{number topic.like_count}} {{d-icon "heart"}}</td>
</a> </a>
{{/if}} {{/if}}
{{/if}} {{/if}}
{{#if showOpLikes}} {{#if showOpLikes}}
<td class="num likes"> <td class="num likes">
{{#if hasOpLikes}} {{#if hasOpLikes}}
<a href='{{topic.summaryUrl}}'> <a href='{{topic.summaryUrl}}'>
{{number topic.op_like_count}} {{d-icon "heart"}}</td> {{number topic.op_like_count}} {{d-icon "heart"}}</td>
</a> </a>
{{/if}} {{/if}}
{{/if}} {{/if}}
<td class="num views {{topic.viewsHeat}}">{{number topic.views numberKey="views_long"}}</td> <td class="num views {{topic.viewsHeat}}">{{number topic.views numberKey="views_long"}}</td>

3
app/assets/stylesheets/common/base/_topic-list.scss
View File

@ -144,9 +144,6 @@
.discourse-tag.box { .discourse-tag.box {
margin-right: 0.25em; margin-right: 0.25em;
} }
.topic-excerpt {
flex: 1 1 0%; // IE11 fix - unit on flexbasis is required
}
} }
.topic-featured-link { .topic-featured-link {