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

FIX: layout problems on categories page

This commit is contained in:
Neil Lalonde 2013-12-12 15:51:21 -05:00
parent 6fa2e68742
commit 52cf27b0a6
2 changed files with 28 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
app/assets/javascripts/discourse/templates/list/wide_categories.js.handlebars
View File

@ -15,22 +15,27 @@
</thead> </thead>
<tbody> <tbody>
{{#each model.categories}} {{#each model.categories}}
<tr data-category_id='{{unbound id}}'> <tr data-category_id='{{unbound id}}' {{bindAttr class="description_excerpt:has-description:no-description"}}>
<td class='category'> <td class='category'>
{{#if controller.ordering}} <div>
<i class="fa fa-bars"></i> <div class="pull-left">
{{/if}} {{#if controller.ordering}}
{{categoryLink this allowUncategorized=true}} <i class="fa fa-bars"></i>
{{#if unreadTopics}} {{/if}}
<a href={{unbound unreadUrl}} class='badge new-posts badge-notification' title='{{i18n topic.unread_topics count="unreadTopics"}}'>{{unbound unreadTopics}}</a> {{categoryLink this allowUncategorized=true}}
{{/if}} {{#if unreadTopics}}
{{#if newTopics}} <a href={{unbound unreadUrl}} class='badge new-posts badge-notification' title='{{i18n topic.unread_topics count="unreadTopics"}}'>{{unbound unreadTopics}}</a>
<a href={{unbound newUrl}} class='badge new-posts badge-notification' title='{{i18n topic.new_topics count="newTopics"}}'>{{unbound newTopics}} <i class='fa fa-asterisk'></i></a> {{/if}}
{{/if}} {{#if newTopics}}
<div class='featured-users'> <a href={{unbound newUrl}} class='badge new-posts badge-notification' title='{{i18n topic.new_topics count="newTopics"}}'>{{unbound newTopics}} <i class='fa fa-asterisk'></i></a>
{{#each featured_users}} {{/if}}
<a href="/users/{{unbound username_lower}}">{{avatar this imageSize="small"}}</a> </div>
{{/each}} <div class='featured-users pull-right'>
{{#each featured_users}}
<a href="/users/{{unbound username_lower}}">{{avatar this imageSize="small"}}</a>
{{/each}}
</div>
<div class="clearfix"></div>
</div> </div>
{{#if description_excerpt}} {{#if description_excerpt}}
<div class="category-description"> <div class="category-description">

16
app/assets/stylesheets/desktop/topic-list.scss
View File

@ -253,12 +253,15 @@
.last-user-info { .last-user-info {
font-size: 12px; font-size: 12px;
} }
tbody td {
padding-bottom: 20px; .has-description td.category {
padding-top: 15px;
} }
td.category { .has-description {
padding-top: 15px; td.category {
padding-top: 15px;
}
} }
.category{ .category{
@ -272,11 +275,8 @@
padding: 4px; padding: 4px;
} }
} }
.featured-users { .featured-users {
position: absolute; margin-right: 13px;
right: 18px;
top: 3px;
} }
.category-description { .category-description {
margin-top: 10px; margin-top: 10px;