From dcea0dd601d314c40a77bdcfe6e9666a4f1ab2ed Mon Sep 17 00:00:00 2001
From: Kegan Dougal <kegan@matrix.org>
Date: Fri, 18 Dec 2015 17:13:57 +0000
Subject: [PATCH] Move min-height to RoomList; remove bottommost prop

---
 src/components/structures/RoomSubList.js       | 4 +---
 src/skins/vector/css/organisms/RoomList.css    | 1 +
 src/skins/vector/css/organisms/RoomSubList.css | 5 -----
 3 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/src/components/structures/RoomSubList.js b/src/components/structures/RoomSubList.js
index afa4fdaa..461c87fb 100644
--- a/src/components/structures/RoomSubList.js
+++ b/src/components/structures/RoomSubList.js
@@ -61,7 +61,6 @@ var RoomSubList = React.createClass({
         tagName: React.PropTypes.string,
         editable: React.PropTypes.bool,
         order: React.PropTypes.string.isRequired,
-        bottommost: React.PropTypes.bool,
         selectedRoom: React.PropTypes.string.isRequired,
         activityMap: React.PropTypes.object.isRequired,
         startAsHidden: React.PropTypes.bool,
@@ -290,8 +289,7 @@ var RoomSubList = React.createClass({
 
         if (this.state.sortedList.length > 0 || this.props.editable) {
             var subList;
-            var classes = "mx_RoomSubList" +
-                          (this.props.bottommost ? " mx_RoomSubList_bottommost" : "");
+            var classes = "mx_RoomSubList";
 
             if (!this.state.hidden) {
                 subList = <div className={ classes }>
diff --git a/src/skins/vector/css/organisms/RoomList.css b/src/skins/vector/css/organisms/RoomList.css
index bb81686c..6b8152e0 100644
--- a/src/skins/vector/css/organisms/RoomList.css
+++ b/src/skins/vector/css/organisms/RoomList.css
@@ -17,6 +17,7 @@ limitations under the License.
 .mx_RoomList {
     padding-top: 24px;
     padding-bottom: 12px;
+    min-height: 400px;
 }
 
 .mx_RoomList_expandButton {
diff --git a/src/skins/vector/css/organisms/RoomSubList.css b/src/skins/vector/css/organisms/RoomSubList.css
index b143c998..46bcc64a 100644
--- a/src/skins/vector/css/organisms/RoomSubList.css
+++ b/src/skins/vector/css/organisms/RoomSubList.css
@@ -20,11 +20,6 @@ limitations under the License.
     width: 100%;
 }
 
-.mx_RoomSubList_bottommost {
-    /* XXX: this should really be 100% of the RoomList height, but can't seem to get at it */
-    min-height: 400px;
-}
-
 .mx_RoomSubList_label {
     text-transform: uppercase;
     color: #3d3b39;