From 52cf27b0a6b44adf03f5cb5c9836144845dc4292 Mon Sep 17 00:00:00 2001
From: Neil Lalonde <neillalonde@gmail.com>
Date: Thu, 12 Dec 2013 15:51:21 -0500
Subject: [PATCH] FIX: layout problems on categories page

---
 .../list/wide_categories.js.handlebars        | 35 +++++++++++--------
 .../stylesheets/desktop/topic-list.scss       | 16 ++++-----
 2 files changed, 28 insertions(+), 23 deletions(-)

diff --git a/app/assets/javascripts/discourse/templates/list/wide_categories.js.handlebars b/app/assets/javascripts/discourse/templates/list/wide_categories.js.handlebars
index 89e68590a19..60146cc8213 100644
--- a/app/assets/javascripts/discourse/templates/list/wide_categories.js.handlebars
+++ b/app/assets/javascripts/discourse/templates/list/wide_categories.js.handlebars
@@ -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">
diff --git a/app/assets/stylesheets/desktop/topic-list.scss b/app/assets/stylesheets/desktop/topic-list.scss
index fa1f41940fb..72d45acb5dc 100644
--- a/app/assets/stylesheets/desktop/topic-list.scss
+++ b/app/assets/stylesheets/desktop/topic-list.scss
@@ -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;