From 5314d2b512a66177919d6cc47937ce89298b3adb Mon Sep 17 00:00:00 2001
From: Toby Zerner <toby.zerner@gmail.com>
Date: Fri, 29 May 2015 18:31:17 +0930
Subject: [PATCH] Refactor discussion list styles, fix loading indicator height
 in pane

---
 .../forum/src/components/discussion-list.js   |  4 +--
 framework/core/less/forum/index.less          | 32 ++++++++++---------
 2 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/framework/core/js/forum/src/components/discussion-list.js b/framework/core/js/forum/src/components/discussion-list.js
index 9fc8f3f04..47e755d19 100644
--- a/framework/core/js/forum/src/components/discussion-list.js
+++ b/framework/core/js/forum/src/components/discussion-list.js
@@ -117,8 +117,8 @@ export default class DiscussionList extends Component {
   }
 
   view() {
-    return m('div', [
-      m('ul.discussions-list', [
+    return m('div.discussion-list', [
+      m('ul', [
         this.discussions().map(discussion => {
           var startUser = discussion.startUser();
           var isUnread = discussion.isUnread();
diff --git a/framework/core/less/forum/index.less b/framework/core/less/forum/index.less
index 7ed9672fa..2d2989221 100644
--- a/framework/core/less/forum/index.less
+++ b/framework/core/less/forum/index.less
@@ -26,9 +26,6 @@
 .index-toolbar-action {
   float: right;
 }
-.index-results .loading-indicator {
-  height: 46px;
-}
 
 @media @phone, @tablet {
   .offset-content {
@@ -84,10 +81,11 @@
       & .hero, & .index-nav, & .index-toolbar {
         display: none;
       }
-      & .discussions-list > li {
+      & .discussion-list > ul > li {
         margin: 0;
         padding-left: 57px + 15px;
         padding-right: 65px + 15px;
+
         &.active {
           background: @fl-body-control-bg;
         }
@@ -132,15 +130,21 @@
 // ------------------------------------
 // Discussions List
 
-.discussions-list {
-  margin: 0;
-  padding: 0;
-  list-style-type: none;
-  position: relative;
+.discussion-list {
+  & .loading-indicator {
+    height: 46px;
+  }
+
+  & > ul {
+    margin: 0;
+    padding: 0;
+    list-style-type: none;
+    position: relative;
+  }
 }
 
 @media @phone {
-  .discussions-list > li {
+  .discussion-list > ul > li {
     padding-right: 45px;
 
     & .contextual-controls {
@@ -150,11 +154,9 @@
 }
 
 @media @tablet, @desktop, @desktop-hd {
-  .discussions-list {
-    & > li {
-      margin-right: -25px;
-      padding-right: 65px + 25px;
-    }
+  .discussion-list > ul > li {
+    margin-right: -25px;
+    padding-right: 65px + 25px;
   }
 }