From a2f5933417197e90b9524f7eb4bd456f9d91b331 Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Tue, 21 Jul 2015 15:43:54 -0700
Subject: [PATCH] make aux panel behave vaguely intelligently

---
 skins/base/css/molecules/RoomSettings.css | 4 ++++
 skins/base/css/organisms/RoomView.css     | 4 ++++
 src/controllers/organisms/RoomView.js     | 2 +-
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/skins/base/css/molecules/RoomSettings.css b/skins/base/css/molecules/RoomSettings.css
index 4100b9e3ee..53686ec94e 100644
--- a/skins/base/css/molecules/RoomSettings.css
+++ b/skins/base/css/molecules/RoomSettings.css
@@ -14,6 +14,10 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
+.mx_RoomSettings {
+    max-height: 250px;
+}
+
 .mx_RoomSettings_settings {
     display: table;
     margin: 5px 0;
diff --git a/skins/base/css/organisms/RoomView.css b/skins/base/css/organisms/RoomView.css
index 57b24c4e52..ceb8a06895 100644
--- a/skins/base/css/organisms/RoomView.css
+++ b/skins/base/css/organisms/RoomView.css
@@ -50,6 +50,10 @@ limitations under the License.
     max-width: 720px;
     width: 100%;
     margin: auto;
+
+    overflow: scroll;
+    -webkit-flex: 0 0 auto;
+    flex: 0 0 auto;
 }
 
 .mx_RoomView_messagePanel {
diff --git a/src/controllers/organisms/RoomView.js b/src/controllers/organisms/RoomView.js
index 332572a5a1..c6a0735bc8 100644
--- a/src/controllers/organisms/RoomView.js
+++ b/src/controllers/organisms/RoomView.js
@@ -86,7 +86,7 @@ module.exports = {
                 });
                 this.forceUpdate();
                 break;
-            case'notifier_enabled':
+            case 'notifier_enabled':
                 this.forceUpdate();
                 break;
         }