category badge now falls below topic title & other small fixes

This commit is contained in:
Kris Aubuchon 2014-10-01 22:54:03 -04:00
parent ffae4929f0
commit eb252bd670
4 changed files with 20 additions and 9 deletions

View File

@ -30,12 +30,7 @@
{{#unless is_warning}}
<span class="private-message-glyph"><i class='fa fa-envelope'></i></span>
{{/unless}}
{{#unless isPrivateMessage}}
{{#if category.parentCategory}}
{{bound-category-link category.parentCategory}}
{{/if}}
{{bound-category-link category}}
{{/unless}}
{{#if details.loaded}}
{{topic-status topic=model}}
<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>
{{/if}}
</h1>
<div class="title-category-wrapper">
{{#unless isPrivateMessage}}
{{#if category.parentCategory}}
{{bound-category-link category.parentCategory}}
{{/if}}
{{bound-category-link category}}
{{/unless}}
</div>
{{/if}}
{{plugin-outlet "topic-title"}}
</div>

View File

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

View File

@ -415,7 +415,7 @@ a.star {
.avatars,
.links,
.information {
padding: 7px 10px;
padding: 7px 10px 15px 10px;
color: $primary;
}
.information {

View File

@ -49,6 +49,10 @@
}
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 {
margin-top: -2px;