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

Merge pull request #2837 from awesomerobot/master 

category badge now falls below topic title & other small fixes
This commit is contained in:
Jeff Atwood 2014-10-01 22:02:00 -07:00
parent ffae4929f0 eb252bd670
commit 2d12451ab1
4 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
app/assets/javascripts/discourse/templates/topic.hbs
View File

@ -30,12 +30,7 @@
{{#unless is_warning}} {{#unless is_warning}}
<span class="private-message-glyph"><i class='fa fa-envelope'></i></span> <span class="private-message-glyph"><i class='fa fa-envelope'></i></span>
{{/unless}} {{/unless}}
{{#unless isPrivateMessage}}
{{#if category.parentCategory}}
{{bound-category-link category.parentCategory}}
{{/if}}
{{bound-category-link category}}
{{/unless}}
{{#if details.loaded}} {{#if details.loaded}}
{{topic-status topic=model}} {{topic-status topic=model}}
<a href='{{unbound url}}' {{action "jumpTop"}}> <a href='{{unbound url}}' {{action "jumpTop"}}>
@ -52,6 +47,16 @@
<a href='#' {{action "editTopic"}} class='edit-topic' title='{{i18n edit}}'><i class="fa fa-pencil"></i></a> <a href='#' {{action "editTopic"}} class='edit-topic' title='{{i18n edit}}'><i class="fa fa-pencil"></i></a>
{{/if}} {{/if}}
</h1> </h1>
<div class="title-category-wrapper">
{{#unless isPrivateMessage}}
{{#if category.parentCategory}}
{{bound-category-link category.parentCategory}}
{{/if}}
{{bound-category-link category}}
{{/unless}}
</div>
{{/if}} {{/if}}
{{plugin-outlet "topic-title"}} {{plugin-outlet "topic-title"}}
</div> </div>

4
app/assets/stylesheets/desktop/poster_expansion.scss
View File

@ -53,6 +53,8 @@
font-weight: normal; font-weight: normal;
margin-top: 0; margin-top: 0;
color: scale-color($primary, $lightness: 50%); color: scale-color($primary, $lightness: 50%);
overflow: hidden;
text-overflow: ellipsis;
} }
.groups { .groups {
font-size: 13px; font-size: 13px;
@ -120,7 +122,7 @@
.badge-section { .badge-section {
margin-top: 10px; margin-top: 10px;
float: left; float: left;
width: 300px; width: 270px;
h3 { h3 {
color: $primary; color: $primary;

4
app/assets/stylesheets/desktop/topic-post.scss
View File

@ -415,7 +415,7 @@ a.star {
.avatars, .avatars,
.links, .links,
.information { .information {
padding: 7px 10px; padding: 7px 10px 15px 10px;
color: $primary; color: $primary;
} }
.information { .information {
@ -716,7 +716,7 @@ blockquote > *:last-child {
margin-top: -2px; margin-top: -2px;
margin-left: -17px; margin-left: -17px;
} }
a.toggle-more { a.toggle-more {
display: block; display: block;
text-align: right; text-align: right;

4
app/assets/stylesheets/desktop/topic.scss
View File

@ -49,6 +49,10 @@
} }
a.edit-topic { font-size: 15px; position: absolute; margin-left: 8px; } a.edit-topic { font-size: 15px; position: absolute; margin-left: 8px; }
} }
.title-category-wrapper {
margin: 5px 0 0 26px;
.badge-category {margin-bottom: 5px;}
}
.topic-statuses { .topic-statuses {
margin-top: -2px; margin-top: -2px;