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

UX: Display category and tags on full page search in a seperate row.

This commit is contained in:
Guo Xiang Tan 2016-06-20 12:03:48 +08:00
parent a891125b92
commit 3d0be0d47c
No known key found for this signature in database
GPG Key ID: 19C321C8952B0F72
3 changed files with 30 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
app/assets/javascripts/discourse/templates/full-page-search.hbs
View File

@ -60,16 +60,20 @@
{{#each model.posts as |result|}} {{#each model.posts as |result|}}
<div class='fps-result'> <div class='fps-result'>
<div class='author'> <div class='author'>
{{avatar result imageSize="large"}} {{avatar result imageSize="large"}}
</div> </div>
<div class='fps-topic'>
<div class='topic'> <div class='topic'>
{{#if bulkSelectEnabled}} {{#if bulkSelectEnabled}}
{{track-selected selectedList=selected selectedId=result.topic}} {{track-selected selectedList=selected selectedId=result.topic}}
{{/if}} {{/if}}
<a class='search-link' href='{{unbound result.url}}'> <a class='search-link' href='{{unbound result.url}}'>
{{topic-status topic=result.topic disableActions=true}}<span class='topic-title'>{{#highlight-text highlight=q}}{{{unbound result.topic.fancyTitle}}}{{/highlight-text}}</span> {{topic-status topic=result.topic disableActions=true}}<span class='topic-title'>{{#highlight-text highlight=q}}{{{unbound result.topic.fancyTitle}}}{{/highlight-text}}</span>
</a> </a>
<div class='search-category'> <div class='search-category'>
{{category-link result.topic.category}} {{category-link result.topic.category}}
{{#each result.topic.tags as |tag|}} {{#each result.topic.tags as |tag|}}
@ -78,26 +82,30 @@
{{plugin-outlet "full-page-search-category"}} {{plugin-outlet "full-page-search-category"}}
</div> </div>
</div> </div>
<div class='blurb container'> <div class='blurb container'>
<span class='date'> <span class='date'>
{{format-age result.created_at}} {{format-age result.created_at}}
{{#if result.blurb}} {{#if result.blurb}}
- -
{{/if}} {{/if}}
</span> </span>
{{#if result.blurb}} {{#if result.blurb}}
{{#highlight-text highlight=q}} {{#highlight-text highlight=q}}
{{{unbound result.blurb}}} {{{unbound result.blurb}}}
{{/highlight-text}} {{/highlight-text}}
{{/if}} {{/if}}
</div> </div>
{{#if showLikeCount}} {{#if showLikeCount}}
{{#if result.like_count}} {{#if result.like_count}}
<span class='like-count'> <span class='like-count'>
{{result.like_count}} <i class="icon fa fa-heart"></i> {{result.like_count}} <i class="icon fa fa-heart"></i>
</span> </span>
{{/if}} {{/if}}
{{/if}} {{/if}}
</div>
</div> </div>
{{/each}} {{/each}}

9
app/assets/stylesheets/common/base/search.scss
View File

@ -1,7 +1,8 @@
.fps-result { .fps-result {
.author { .author {
float: left; display: inline-block;
vertical-align: top;
} }
.like-count { .like-count {
@ -14,7 +15,6 @@
} }
.search-category { .search-category {
float:right;
padding-top:3px; padding-top:3px;
} }
@ -46,7 +46,6 @@
.blurb { .blurb {
font-size: 1.0em; font-size: 1.0em;
line-height: 20px; line-height: 20px;
margin-left: 60px;
word-wrap: break-word; word-wrap: break-word;
max-width: 640px; max-width: 640px;
color: dark-light-choose(scale-color($primary, $lightness: 40%), scale-color($secondary, $lightness: 60%)); color: dark-light-choose(scale-color($primary, $lightness: 40%), scale-color($secondary, $lightness: 60%));
@ -64,6 +63,10 @@
} }
} }
.fps-topic {
display: inline-block;
}
.fps-select { .fps-select {
margin-top: -15px; margin-top: -15px;
margin-bottom: 15px; margin-bottom: 15px;

4
app/assets/stylesheets/mobile/search.scss
View File

@ -14,3 +14,7 @@
.fps-search-context { .fps-search-context {
margin-bottom: 15px; margin-bottom: 15px;
} }
.fps-topic {
max-width: 75%;
}