From f035b8c50e0ccb1380fc1a25fdf99547cf1ab2b7 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Thu, 4 Feb 2016 18:09:24 +0000
Subject: [PATCH 01/22] Rate limit UI updates to avoid browser death

---
 src/components/structures/RightPanel.js | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/components/structures/RightPanel.js b/src/components/structures/RightPanel.js
index c12f53f4c7..105676704c 100644
--- a/src/components/structures/RightPanel.js
+++ b/src/components/structures/RightPanel.js
@@ -20,6 +20,7 @@ var React = require('react');
 var sdk = require('matrix-react-sdk')
 var dis = require('matrix-react-sdk/lib/dispatcher');
 var MatrixClientPeg = require("matrix-react-sdk/lib/MatrixClientPeg");
+var rate_limited_func = require('matrix-react-sdk/lib/ratelimitedfunc');
 
 module.exports = React.createClass({
     displayName: 'RightPanel',
@@ -66,15 +67,19 @@ module.exports = React.createClass({
     onRoomStateMember: function(ev, state, member) {
         // redraw the badge on the membership list
         if (this.state.phase == this.Phase.MemberList && member.roomId === this.props.roomId) {
-            this.forceUpdate();
+            this._delayedUpdate();
         }
         else if (this.state.phase === this.Phase.MemberInfo && member.roomId === this.props.roomId &&
                 member.userId === this.state.member.userId) {
             // refresh the member info (e.g. new power level)
-            this.forceUpdate();
+            this._delayedUpdate();
         }
     },
 
+    _delayedUpdate: new rate_limited_func(function() {
+        this.forceUpdate()
+    }, 500),
+
     onAction: function(payload) {
         if (payload.action === "view_user") {
             if (payload.member) {

From ab9dfd185c081348e9a62f60ef332d8eef33e865 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Thu, 4 Feb 2016 18:43:23 +0000
Subject: [PATCH 02/22] Add note to not use npm start in production

---
 README.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 529e7cdf0f..a40fa56fd5 100644
--- a/README.md
+++ b/README.md
@@ -15,7 +15,8 @@ Getting started
 7. Open http://127.0.0.1:8080/ in your browser to see your newly built Vector.
 
 With `npm start`, any changes you make to the source files will cause a rebuild so
-your changes will show up when you refresh.
+your changes will show up when you refresh. This development server also disables
+caching, so do NOT use it in production.
 
 For production use, run `npm run build` to build all the necessary files
 into the `vector` directory and run your own server.

From 485343864ccf433afa4fc0ac868db363faa801b4 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Fri, 5 Feb 2016 10:57:49 +0000
Subject: [PATCH 03/22] semicolon

---
 src/components/structures/RightPanel.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/structures/RightPanel.js b/src/components/structures/RightPanel.js
index 105676704c..dc4f606c31 100644
--- a/src/components/structures/RightPanel.js
+++ b/src/components/structures/RightPanel.js
@@ -77,7 +77,7 @@ module.exports = React.createClass({
     },
 
     _delayedUpdate: new rate_limited_func(function() {
-        this.forceUpdate()
+        this.forceUpdate();
     }, 500),
 
     onAction: function(payload) {

From 27791c06ee27a5266d7bf76843ae2612d8930b26 Mon Sep 17 00:00:00 2001
From: Kegan Dougal <kegan@matrix.org>
Date: Fri, 5 Feb 2016 15:53:33 +0000
Subject: [PATCH 04/22] Cache-bust on /version request

---
 src/vector/updater.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/vector/updater.js b/src/vector/updater.js
index 0daba7285d..e8d6830d02 100644
--- a/src/vector/updater.js
+++ b/src/vector/updater.js
@@ -43,7 +43,8 @@ module.exports = {
                 }
             }
         });
-        req.open("GET", "version");
+        var cacheBuster = "?ts=" + new Date().getTime();
+        req.open("GET", "version" + cacheBuster);
         req.send(); // can't suppress 404s from being logged.
 
         setTimeout(module.exports.run, POKE_RATE_MS);

From 1732805f31a1838424113bea6d099405d4804a83 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Wed, 10 Feb 2016 13:45:24 +0000
Subject: [PATCH 05/22] Always parse the hash of a URL as we do elsewhere by
 looking for a query string part, otherwise we end up passing the query into
 showscreen which then spreads havok.

---
 src/vector/index.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/vector/index.js b/src/vector/index.js
index 1d845adf06..0d2b19ee8d 100644
--- a/src/vector/index.js
+++ b/src/vector/index.js
@@ -94,7 +94,8 @@ function routeUrl(location) {
     else if (location.hash.indexOf('#/register') == 0) {
         window.matrixChat.showScreen('register', parseQsFromFragment(location));
     } else {
-        window.matrixChat.showScreen(location.hash.substring(2));
+        var hashparts = location.hash.split('?');
+        window.matrixChat.showScreen(hashparts[0].substring(2));
     }
 }
 

From 155728b136f00c9c1a8e69284578c8e7e7b59659 Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Wed, 10 Feb 2016 14:54:49 +0000
Subject: [PATCH 06/22] make babel actually do full ES6 emulation for Safari 8

---
 package.json        | 1 +
 src/vector/index.js | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/package.json b/package.json
index 42aa567eb1..8b1ea71022 100644
--- a/package.json
+++ b/package.json
@@ -27,6 +27,7 @@
     "prepublish": "npm run build:css && npm run build:compile"
   },
   "dependencies": {
+    "babel-polyfill": "^6.5.0",
     "classnames": "^2.1.2",
     "extract-text-webpack-plugin": "^0.9.1",
     "filesize": "^3.1.2",
diff --git a/src/vector/index.js b/src/vector/index.js
index 0d2b19ee8d..0b23955745 100644
--- a/src/vector/index.js
+++ b/src/vector/index.js
@@ -16,6 +16,10 @@ limitations under the License.
 
 'use strict';
 
+// for ES6 stuff like startsWith() that Safari doesn't handle
+// and babel doesn't do by default
+require('babel-polyfill');
+
 // CSS requires: just putting them here for now as CSS is going to be
 // refactored soon anyway
 require('../../vector/components.css');

From 93f8fcbacc633b414604d30cc0eb267f6e001c45 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Wed, 10 Feb 2016 15:35:06 +0000
Subject: [PATCH 07/22] Add 'package' script to build a webapp bundle for
 straight unzipping on a production server.

---
 .gitignore   | 1 +
 package.json | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/.gitignore b/.gitignore
index f5a3b1bdcd..2bc43f864a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@ lib
 key.pem
 cert.pem
 vector/components.css
+packages/
diff --git a/package.json b/package.json
index 42aa567eb1..1a5aa100bd 100644
--- a/package.json
+++ b/package.json
@@ -17,6 +17,7 @@
     "build:compile": "babel --source-maps -d lib src",
     "build:bundle": "NODE_ENV=production webpack -p lib/vector/index.js vector/bundle.js",
     "build": "npm run build:css && npm run build:compile && npm run build:bundle",
+    "package": "npm run build && mkdir packages && bestzip packages/vector-`git describe --dirty || echo unknown`.zip vector",
     "start:js": "webpack -w src/vector/index.js vector/bundle.js",
     "start:js:prod": "NODE_ENV=production webpack -w src/vector/index.js vector/bundle.js",
     "start:skins:css": "catw \"src/skins/vector/css/**/*.css\" -o vector/components.css",
@@ -49,6 +50,7 @@
     "babel": "^5.8.23",
     "babel-core": "^5.8.25",
     "babel-loader": "^5.3.2",
+    "bestzip": "^1.1.3",
     "catw": "^1.0.1",
     "css-raw-loader": "^0.1.1",
     "http-server": "^0.8.4",

From 369e35774216df4e63b5411bafc4c2aca1773ee8 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Thu, 11 Feb 2016 13:40:26 +0000
Subject: [PATCH 08/22] We expect the mkdir to fail when the dir exists, so use
 ; not &&

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 1a5aa100bd..89e51e0361 100644
--- a/package.json
+++ b/package.json
@@ -17,7 +17,7 @@
     "build:compile": "babel --source-maps -d lib src",
     "build:bundle": "NODE_ENV=production webpack -p lib/vector/index.js vector/bundle.js",
     "build": "npm run build:css && npm run build:compile && npm run build:bundle",
-    "package": "npm run build && mkdir packages && bestzip packages/vector-`git describe --dirty || echo unknown`.zip vector",
+    "package": "npm run build && mkdir packages; bestzip packages/vector-`git describe --dirty || echo unknown`.zip vector",
     "start:js": "webpack -w src/vector/index.js vector/bundle.js",
     "start:js:prod": "NODE_ENV=production webpack -w src/vector/index.js vector/bundle.js",
     "start:skins:css": "catw \"src/skins/vector/css/**/*.css\" -o vector/components.css",

From 3c75c43d37356f73c1751052e679777d391eea4b Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Thu, 11 Feb 2016 13:59:40 +0000
Subject: [PATCH 09/22] Bail if build step fails

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 89e51e0361..ff3789e9fa 100644
--- a/package.json
+++ b/package.json
@@ -17,7 +17,7 @@
     "build:compile": "babel --source-maps -d lib src",
     "build:bundle": "NODE_ENV=production webpack -p lib/vector/index.js vector/bundle.js",
     "build": "npm run build:css && npm run build:compile && npm run build:bundle",
-    "package": "npm run build && mkdir packages; bestzip packages/vector-`git describe --dirty || echo unknown`.zip vector",
+    "package": "npm run build && (mkdir packages || true) && bestzip packages/vector-`git describe --dirty || echo unknown`.zip vector",
     "start:js": "webpack -w src/vector/index.js vector/bundle.js",
     "start:js:prod": "NODE_ENV=production webpack -w src/vector/index.js vector/bundle.js",
     "start:skins:css": "catw \"src/skins/vector/css/**/*.css\" -o vector/components.css",

From b929f80be8910d49c66382cd9de5fafa50b4b8ec Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Thu, 11 Feb 2016 14:59:22 +0000
Subject: [PATCH 10/22] Use tar for packaging because zip can't traverse
 directory symlinks, hence ditch windows support for packaging.

---
 package.json | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 06895de1b5..ce1e03b8d1 100644
--- a/package.json
+++ b/package.json
@@ -17,7 +17,7 @@
     "build:compile": "babel --source-maps -d lib src",
     "build:bundle": "NODE_ENV=production webpack -p lib/vector/index.js vector/bundle.js",
     "build": "npm run build:css && npm run build:compile && npm run build:bundle",
-    "package": "npm run build && (mkdir packages || true) && bestzip packages/vector-`git describe --dirty || echo unknown`.zip vector",
+    "package": "npm run build && mkdir -p packages && tar chvzf packages/vector-`git describe --dirty || echo unknown`.tar.gz vector",
     "start:js": "webpack -w src/vector/index.js vector/bundle.js",
     "start:js:prod": "NODE_ENV=production webpack -w src/vector/index.js vector/bundle.js",
     "start:skins:css": "catw \"src/skins/vector/css/**/*.css\" -o vector/components.css",
@@ -51,7 +51,6 @@
     "babel": "^5.8.23",
     "babel-core": "^5.8.25",
     "babel-loader": "^5.3.2",
-    "bestzip": "^1.1.3",
     "catw": "^1.0.1",
     "css-raw-loader": "^0.1.1",
     "http-server": "^0.8.4",

From 82b498017dc0d14c18d0502ba52663380c733693 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Thu, 11 Feb 2016 15:01:32 +0000
Subject: [PATCH 11/22] Bumb webpack micro version (although it would have
 installed the latest micro version anyway) to maybe get a webpack that
 doesn't throw stack depth errors.

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 06895de1b5..7081b67303 100644
--- a/package.json
+++ b/package.json
@@ -59,6 +59,6 @@
     "parallelshell": "^1.2.0",
     "rimraf": "^2.4.3",
     "source-map-loader": "^0.1.5",
-    "webpack": "^1.12.6"
+    "webpack": "^1.12.13"
   }
 }

From f3df0d07f8985874caff8c2fafe56a8f84d9ce3f Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Sun, 14 Feb 2016 13:32:15 +0200
Subject: [PATCH 12/22] filter room directory case insensitively

---
 src/components/structures/RoomDirectory.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/structures/RoomDirectory.js b/src/components/structures/RoomDirectory.js
index 0c65e107e7..09c15a1cc9 100644
--- a/src/components/structures/RoomDirectory.js
+++ b/src/components/structures/RoomDirectory.js
@@ -69,7 +69,7 @@ module.exports = React.createClass({
         var rooms = this.state.publicRooms.filter(function(a) {
             // FIXME: if incrementally typing, keep narrowing down the search set
             // incrementally rather than starting over each time.
-            return (a.aliases[0].search(filter) >= 0 && a.num_joined_members > 0);
+            return (a.aliases[0].toLowerCase().search(filter.toLowerCase()) >= 0 && a.num_joined_members > 0);
         }).sort(function(a,b) {
             return a.num_joined_members - b.num_joined_members;
         });

From 0ca6efdfca314b6e540e238b9058d231b214e517 Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Sun, 14 Feb 2016 21:28:01 +0200
Subject: [PATCH 13/22] fix the nightmarish
 https://github.com/vector-im/vector-web/issues/917

---
 .../vector/css/matrix-react-sdk/views/rooms/MemberList.css    | 4 ++--
 src/skins/vector/css/vector-web/structures/RightPanel.css     | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/skins/vector/css/matrix-react-sdk/views/rooms/MemberList.css b/src/skins/vector/css/matrix-react-sdk/views/rooms/MemberList.css
index 5844d5f1d7..4433c1e945 100644
--- a/src/skins/vector/css/matrix-react-sdk/views/rooms/MemberList.css
+++ b/src/skins/vector/css/matrix-react-sdk/views/rooms/MemberList.css
@@ -57,8 +57,8 @@ limitations under the License.
 
 .mx_MemberList_joined {
     order: 2;
-    flex: 1 1 50%;
-    -webkit-flex: 1 1 50%;
+    flex: 1 1 100%;
+    -webkit-flex: 1 1 100%;
 
     overflow-y: auto;
 }
diff --git a/src/skins/vector/css/vector-web/structures/RightPanel.css b/src/skins/vector/css/vector-web/structures/RightPanel.css
index 12e101a37a..f61282b6ca 100644
--- a/src/skins/vector/css/vector-web/structures/RightPanel.css
+++ b/src/skins/vector/css/vector-web/structures/RightPanel.css
@@ -17,6 +17,8 @@ limitations under the License.
 .mx_RightPanel {
     position: relative;
 
+    height: 100%; /* needed for memberlist flexbox to work in chrome 48+ */
+
     display: -webkit-box;
     display: -moz-box;
     display: -ms-flexbox;

From a2193d61b07bdf32b6c3978308761dded63881cb Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Sun, 14 Feb 2016 21:34:32 +0200
Subject: [PATCH 14/22] show the leave button by default for now as it causes
 too much pain otherwise

---
 .../vector/css/matrix-react-sdk/views/rooms/RoomHeader.css   | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/src/skins/vector/css/matrix-react-sdk/views/rooms/RoomHeader.css b/src/skins/vector/css/matrix-react-sdk/views/rooms/RoomHeader.css
index 78ce5d22aa..664c31703b 100644
--- a/src/skins/vector/css/matrix-react-sdk/views/rooms/RoomHeader.css
+++ b/src/skins/vector/css/matrix-react-sdk/views/rooms/RoomHeader.css
@@ -184,14 +184,9 @@ limitations under the License.
 }
 
 .mx_RoomHeader_leaveButton {
-    visibility: hidden;
     margin-top: -1px;
 }
 
-.mx_RoomHeader_wrapper:hover .mx_RoomHeader_leaveButton {
-    visibility: visible;
-}
-
 .mx_RoomHeader_placeholder {
     color: #a2a2a2 ! important;
 }

From ad9935739c96caeedfdd778ca681c42e281924f9 Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Mon, 15 Feb 2016 09:56:52 +0200
Subject: [PATCH 15/22] proper fix for
 https://github.com/vector-im/vector-web/issues/917 and resolve
 https://github.com/vector-im/vector-web/issues/928

---
 .../css/matrix-react-sdk/views/rooms/MemberList.css       | 8 ++++----
 src/skins/vector/css/vector-web/structures/RightPanel.css | 2 --
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/skins/vector/css/matrix-react-sdk/views/rooms/MemberList.css b/src/skins/vector/css/matrix-react-sdk/views/rooms/MemberList.css
index 4433c1e945..fb24cc3cec 100644
--- a/src/skins/vector/css/matrix-react-sdk/views/rooms/MemberList.css
+++ b/src/skins/vector/css/matrix-react-sdk/views/rooms/MemberList.css
@@ -51,14 +51,14 @@ limitations under the License.
 }
 
 .mx_MemberList .mx_SearchableEntityList_expanded {
-    flex: 1 1 100%;
-    -webkit-flex: 1 1 100%;
+    flex: 1 0 0;
+    -webkit-flex: 1 0 0;
 }
 
 .mx_MemberList_joined {
     order: 2;
-    flex: 1 1 100%;
-    -webkit-flex: 1 1 100%;
+    flex: 1 0 0;
+    -webkit-flex: 1 0 0;
 
     overflow-y: auto;
 }
diff --git a/src/skins/vector/css/vector-web/structures/RightPanel.css b/src/skins/vector/css/vector-web/structures/RightPanel.css
index f61282b6ca..12e101a37a 100644
--- a/src/skins/vector/css/vector-web/structures/RightPanel.css
+++ b/src/skins/vector/css/vector-web/structures/RightPanel.css
@@ -17,8 +17,6 @@ limitations under the License.
 .mx_RightPanel {
     position: relative;
 
-    height: 100%; /* needed for memberlist flexbox to work in chrome 48+ */
-
     display: -webkit-box;
     display: -moz-box;
     display: -ms-flexbox;

From 177fba360ddf5153a0b59f53d8e770656cca9717 Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Mon, 15 Feb 2016 11:13:24 +0200
Subject: [PATCH 16/22] shrink 3pid invite placeholder text

---
 .../css/matrix-react-sdk/views/rooms/SearchableEntityList.css   | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/skins/vector/css/matrix-react-sdk/views/rooms/SearchableEntityList.css b/src/skins/vector/css/matrix-react-sdk/views/rooms/SearchableEntityList.css
index 3e88508cd0..0d7639bfca 100644
--- a/src/skins/vector/css/matrix-react-sdk/views/rooms/SearchableEntityList.css
+++ b/src/skins/vector/css/matrix-react-sdk/views/rooms/SearchableEntityList.css
@@ -37,11 +37,13 @@ limitations under the License.
 .mx_SearchableEntityList_query::-moz-placeholder {
     color: #454545;
     opacity: 0.5;
+    font-size: 12px;
 }
 
 .mx_SearchableEntityList_query::-webkit-input-placeholder {
     color: #454545;
     opacity: 0.5;
+    font-size: 12px;
 }
 
 .mx_SearchableEntityList_listWrapper {

From 8e008572e50823a455454567a959005fbfe7b182 Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Mon, 15 Feb 2016 19:37:19 +0200
Subject: [PATCH 17/22] CSS for setting display name prompt

---
 src/skins/vector/css/common.css               |  6 +++--
 .../views/dialogs/SetDisplayNameDialog.css    | 23 +++++++++++++++++++
 2 files changed, 27 insertions(+), 2 deletions(-)
 create mode 100644 src/skins/vector/css/matrix-react-sdk/views/dialogs/SetDisplayNameDialog.css

diff --git a/src/skins/vector/css/common.css b/src/skins/vector/css/common.css
index 434b4ae545..53ab57fe05 100644
--- a/src/skins/vector/css/common.css
+++ b/src/skins/vector/css/common.css
@@ -202,7 +202,9 @@ input[type=text]:focus, textarea:focus {
 }
 
 .mx_TextInputDialog_input {
-    color: #747474;
-    font-weight: 300;
     font-size: 15px;
+    border-radius: 3px;
+    border: 1px solid #f0f0f0;
+    padding: 9px;
+    color: #454545;
 }
diff --git a/src/skins/vector/css/matrix-react-sdk/views/dialogs/SetDisplayNameDialog.css b/src/skins/vector/css/matrix-react-sdk/views/dialogs/SetDisplayNameDialog.css
new file mode 100644
index 0000000000..66a796720d
--- /dev/null
+++ b/src/skins/vector/css/matrix-react-sdk/views/dialogs/SetDisplayNameDialog.css
@@ -0,0 +1,23 @@
+/*
+Copyright 2015, 2016 OpenMarket Ltd
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+.mx_SetDisplayNameDialog_input {
+    border-radius: 3px;
+    border: 1px solid #f0f0f0;
+    padding: 9px;
+    color: #454545;
+    font-size: 15px;
+}
\ No newline at end of file

From 58959d014a1940d777ab19f9975d882d2dee8e14 Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Mon, 15 Feb 2016 22:01:30 +0200
Subject: [PATCH 18/22] show vaguely accurate default avatar

---
 .../vector/css/matrix-react-sdk/structures/UserSettings.css   | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/skins/vector/css/matrix-react-sdk/structures/UserSettings.css b/src/skins/vector/css/matrix-react-sdk/structures/UserSettings.css
index b16389ee43..ea1710dac6 100644
--- a/src/skins/vector/css/matrix-react-sdk/structures/UserSettings.css
+++ b/src/skins/vector/css/matrix-react-sdk/structures/UserSettings.css
@@ -170,6 +170,10 @@ limitations under the License.
     cursor: pointer;
 }
 
+.mx_UserSettings_avatarPicker_img .mx_BaseAvatar_image {
+    object-fit: cover;
+}
+
 .mx_UserSettings_avatarPicker_edit {
     text-align: center;
     margin-top: 10px;

From 11c9aff69a900231e30ba29e56a6772b377bbd47 Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Mon, 15 Feb 2016 22:06:16 +0200
Subject: [PATCH 19/22] fix radiobutton css

---
 .../vector/css/matrix-react-sdk/views/rooms/RoomSettings.css   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/skins/vector/css/matrix-react-sdk/views/rooms/RoomSettings.css b/src/skins/vector/css/matrix-react-sdk/views/rooms/RoomSettings.css
index 006882ebb5..172da8eb51 100644
--- a/src/skins/vector/css/matrix-react-sdk/views/rooms/RoomSettings.css
+++ b/src/skins/vector/css/matrix-react-sdk/views/rooms/RoomSettings.css
@@ -64,7 +64,8 @@ limitations under the License.
     display: block;
 }
 
-.mx_RoomSettings .mx_RoomSettings_toggles input[type="checkbox"] {
+.mx_RoomSettings .mx_RoomSettings_toggles input[type="checkbox"],
+.mx_RoomSettings .mx_RoomSettings_toggles input[type="radio"] {
     margin-right: 7px;
 }
 

From cdc144780480089f9beef40c375db2f616a8cf28 Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Mon, 15 Feb 2016 20:19:30 +0000
Subject: [PATCH 20/22] fix search highlight css

---
 .../vector/css/matrix-react-sdk/views/rooms/EventTile.css     | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/skins/vector/css/matrix-react-sdk/views/rooms/EventTile.css b/src/skins/vector/css/matrix-react-sdk/views/rooms/EventTile.css
index 258364fa76..519cbba3b8 100644
--- a/src/skins/vector/css/matrix-react-sdk/views/rooms/EventTile.css
+++ b/src/skins/vector/css/matrix-react-sdk/views/rooms/EventTile.css
@@ -102,7 +102,9 @@ limitations under the License.
     background-color: #76cfa6;
     color: #fff;
     border-radius: 5px;
-    padding: 4px;
+    padding-left: 2px;
+    padding-right: 2px;
+    cursor: pointer;
 }
 
 .mx_EventTile_searchHighlight a {

From 2cd3150c560354ac9c785fd40b66d4fa4104a449 Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Mon, 15 Feb 2016 20:22:45 +0000
Subject: [PATCH 21/22] tart up mx_EventTile_selected

---
 .../vector/css/matrix-react-sdk/views/rooms/EventTile.css | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/skins/vector/css/matrix-react-sdk/views/rooms/EventTile.css b/src/skins/vector/css/matrix-react-sdk/views/rooms/EventTile.css
index 519cbba3b8..b2451a5374 100644
--- a/src/skins/vector/css/matrix-react-sdk/views/rooms/EventTile.css
+++ b/src/skins/vector/css/matrix-react-sdk/views/rooms/EventTile.css
@@ -90,12 +90,12 @@ limitations under the License.
 /* end of overrides */
 
 /* this is used for the tile for the event which is selected via the URL.  
- * for now, it is just a crude color; ultimately we probably want some
- * transition on here.  
+ * TODO: ultimately we probably want some transition on here.  
  */
 .mx_EventTile_selected { 
-    background-color: #76cfa6; 
-    color: #fff;
+    border-left: #76cfa6 5px solid;
+    margin-left: 53px;
+    padding-left: 7px;
 }
 
 .mx_EventTile_searchHighlight {

From 3c659dcf57c6102385f8b99acb91e77b25612e50 Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Wed, 17 Feb 2016 12:43:42 +0000
Subject: [PATCH 22/22] experimental fix for
 https://github.com/vector-im/vector-web/issues/947 and
 https://github.com/vector-im/vector-web/issues/946. may well introduce more
 problems

---
 .../vector/css/matrix-react-sdk/structures/MatrixChat.css  | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/skins/vector/css/matrix-react-sdk/structures/MatrixChat.css b/src/skins/vector/css/matrix-react-sdk/structures/MatrixChat.css
index 47db997c38..e8a5eb795b 100644
--- a/src/skins/vector/css/matrix-react-sdk/structures/MatrixChat.css
+++ b/src/skins/vector/css/matrix-react-sdk/structures/MatrixChat.css
@@ -116,6 +116,13 @@ limitations under the License.
     -webkit-flex: 1;
     flex: 1;
 
+    /* Experimental fix for https://github.com/vector-im/vector-web/issues/947
+       and https://github.com/vector-im/vector-web/issues/946.
+       Empirically this stops the MessagePanel's width exploding outwards when
+       gemini is in 'prevented' mode
+       */
+    overflow-x: auto;
+
     /* XXX: Hack: apparently if you try to nest a flex-box
      * within a non-flex-box within a flex-box, the height
      * of the innermost element gets miscalculated if the