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

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

@ -15,8 +15,10 @@
</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'>
<div>
<div class="pull-left">
{{#if controller.ordering}} {{#if controller.ordering}}
<i class="fa fa-bars"></i> <i class="fa fa-bars"></i>
{{/if}} {{/if}}
@ -27,11 +29,14 @@
{{#if newTopics}} {{#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> <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}}
<div class='featured-users'> </div>
<div class='featured-users pull-right'>
{{#each featured_users}} {{#each featured_users}}
<a href="/users/{{unbound username_lower}}">{{avatar this imageSize="small"}}</a> <a href="/users/{{unbound username_lower}}">{{avatar this imageSize="small"}}</a>
{{/each}} {{/each}}
</div> </div>
<div class="clearfix"></div>
</div>
{{#if description_excerpt}} {{#if description_excerpt}}
<div class="category-description"> <div class="category-description">
{{{description_excerpt}}} {{{description_excerpt}}}

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

@ -253,13 +253,16 @@
.last-user-info { .last-user-info {
font-size: 12px; font-size: 12px;
} }
tbody td {
padding-bottom: 20px; .has-description td.category {
padding-top: 15px;
} }
.has-description {
td.category { td.category {
padding-top: 15px; padding-top: 15px;
} }
}
.category{ .category{
position: relative; position: relative;
@ -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;