From edc3302d89324f6a706aeaea5f776fd0c9d8563c Mon Sep 17 00:00:00 2001
From: Erik Johnston <erikj@matrix.org>
Date: Thu, 16 Jul 2015 09:43:00 +0100
Subject: [PATCH] Fix broken RoomView CSS due to name clashes and splitting an
 element in two.

---
 skins/base/css/organisms/RoomView.css | 3 ++-
 skins/base/css/pages/MatrixChat.css   | 2 +-
 skins/base/views/pages/MatrixChat.js  | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/skins/base/css/organisms/RoomView.css b/skins/base/css/organisms/RoomView.css
index 9a9e6b4aee..bc1a16927d 100644
--- a/skins/base/css/organisms/RoomView.css
+++ b/skins/base/css/organisms/RoomView.css
@@ -24,6 +24,7 @@ limitations under the License.
     display: -webkit-flex;
     display: flex;
     width: 100%;
+    height: 100%;
     flex-direction: column;
     -webkit-flex-direction: column;
 }
@@ -65,7 +66,7 @@ limitations under the License.
     margin-bottom: 60px;
     /* background-color: #ff0; */
 
-    overflow-y: scroll;    
+    overflow-y: scroll;
 }
 
 .mx_RoomView_messageListWrapper {
diff --git a/skins/base/css/pages/MatrixChat.css b/skins/base/css/pages/MatrixChat.css
index b0f30c1131..544204116a 100644
--- a/skins/base/css/pages/MatrixChat.css
+++ b/skins/base/css/pages/MatrixChat.css
@@ -38,7 +38,7 @@ limitations under the License.
     height: 100%;
 }
 
-.mx_MatrixChat .mx_MainView {
+.mx_MatrixChat .mx_MatrixChat_MiddleView {
     -webkit-box-ordinal-group: 2;
     -moz-box-ordinal-group: 2;
     -ms-flex-order: 2;
diff --git a/skins/base/views/pages/MatrixChat.js b/skins/base/views/pages/MatrixChat.js
index ecfbd96f10..7c37c0fe71 100644
--- a/skins/base/views/pages/MatrixChat.js
+++ b/skins/base/views/pages/MatrixChat.js
@@ -51,7 +51,7 @@ module.exports = React.createClass({
             return (
                 <div className="mx_MatrixChat">
                     <LeftPanel selectedRoom={this.state.currentRoom} />
-                    <div className="mx_MainView">
+                    <div className="mx_MatrixChat_MiddleView">
                         {page_element}
                     </div>
                     {right_panel}