Merge branch 'develop' into luke/rts-welcome-pages

Conflicts:
	src/skins/vector/css/matrix-react-sdk/views/rooms/_RoomPreviewBar.scss

.travis.yml

@@ -4,4 +4,4 @@ node_js:
 install:
     - npm install
     - (cd node_modules/matrix-js-sdk && npm install)
-    - (cd node_modules/matrix-react-sdk && npm run build)
+    - (cd node_modules/matrix-react-sdk && npm install)

scripts/jenkins.sh

@@ -20,8 +20,8 @@ rm -r node_modules/olm
 cp -r olm/package node_modules/olm
 
 # we may be using dev branches of js-sdk and react-sdk, in which case we need to build them
-(cd node_modules/matrix-js-sdk && npm run build)
-(cd node_modules/matrix-react-sdk && npm run build)
+(cd node_modules/matrix-js-sdk && npm install)
+(cd node_modules/matrix-react-sdk && npm install)
 
 # run the mocha tests
 npm run test

src/skins/vector/css/matrix-react-sdk/views/dialogs/_UnknownDeviceDialog.scss

@@ -14,6 +14,27 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
+// CSS voodoo to support a gemini-scrollbar for the contents of the dialog
+.mx_Dialog_unknownDevice .mx_Dialog {
+    // ideally we'd shrink the height to fit when needed, but in practice this
+    // is a pain in the ass. plus might as well make the dialog big given how
+    // important it is.
+    height: 100%;
+
+    // position the gemini scrollbar nicely
+    padding-right: 58px;
+}
+
+.mx_UnknownDeviceDialog {
+    height: 100%;
+    display: flex;
+    flex-direction: column;
+}
+
+.mx_UnknownDeviceDialog .mx_Dialog_content {
+    margin-bottom: 24px;
+}
+
 .mx_UnknownDeviceDialog .mx_MemberDeviceInfo {
     float: right;
     clear: both;

src/skins/vector/css/matrix-react-sdk/views/rooms/_RoomPreviewBar.scss

@@ -17,7 +17,7 @@ limitations under the License.
 .mx_RoomPreviewBar {
     text-align: center;
     height: 176px;
-
+    background-color: $event-selected-color;
     align-items: center;
     flex-direction: column;
     justify-content: center;

src/skins/vector/css/matrix-react-sdk/views/rooms/_RoomTile.scss

@@ -190,6 +190,11 @@ limitations under the License.
     background-color: $roomtile-selected-bg-color;
 }
 
+.mx_RoomTile:focus {
+    outline: 0;
+    background-color: $roomtile-focused-bg-color;
+}
+
 .mx_RoomTile .mx_RoomTile_name.mx_RoomTile_badgeShown {
     width: 140px;
 }

src/skins/vector/css/themes/_base.scss

@@ -76,6 +76,7 @@ $voip-accept-color: #80f480;
 
 $roomtile-name-color: rgba(69, 69, 69, 0.8);
 $roomtile-selected-bg-color: rgba(255, 255, 255, 0.8);
+$roomtile-focused-bg-color: rgba(255, 255, 255, 0.9);
 
 $roomsublist-label-fg-color: $h3-color;
 $roomsublist-label-bg-color: #d3efe1;

src/skins/vector/css/themes/_dark.scss

@@ -76,6 +76,7 @@ $voip-accept-color: #80f480;
 
 $roomtile-name-color: rgba(186, 186, 186, 0.8);
 $roomtile-selected-bg-color: rgba(255, 255, 255, 0.05);
+$roomtile-focused-bg-color: rgba(255, 255, 255, 0.2);
 
 $roomsublist-label-fg-color: $h3-color;
 $roomsublist-label-bg-color: #454545;