github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-27 20:13:38 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: layout problems on categories page

Browse Source
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>
<tbody>
{{#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'>
{{#if controller.ordering}}
<i class="fa fa-bars"></i>
{{/if}}
{{categoryLink this allowUncategorized=true}}
{{#if unreadTopics}}
<a href={{unbound unreadUrl}} class='badge new-posts badge-notification' title='{{i18n topic.unread_topics count="unreadTopics"}}'>{{unbound unreadTopics}}</a>
{{/if}}
{{#if newTopics}}
<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}}
<div class='featured-users'>
{{#each featured_users}}
<a href="/users/{{unbound username_lower}}">{{avatar this imageSize="small"}}</a>
{{/each}}
<div>
<div class="pull-left">
{{#if controller.ordering}}
<i class="fa fa-bars"></i>
{{/if}}
{{categoryLink this allowUncategorized=true}}
{{#if unreadTopics}}
<a href={{unbound unreadUrl}} class='badge new-posts badge-notification' title='{{i18n topic.unread_topics count="unreadTopics"}}'>{{unbound unreadTopics}}</a>
{{/if}}
{{#if newTopics}}
<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}}
</div>
<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>
{{#if description_excerpt}}
<div class="category-description">

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

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