Merge branch 'develop' into rav/update_status_bar

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

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;

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;
+}

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

@@ -90,19 +90,21 @@ 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 {
     background-color: #76cfa6;
     color: #fff;
     border-radius: 5px;
-    padding: 4px;
+    padding-left: 2px;
+    padding-right: 2px;
+    cursor: pointer;
 }
 
 .mx_EventTile_searchHighlight a {

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 50%;
-    -webkit-flex: 1 1 50%;
+    flex: 1 0 0;
+    -webkit-flex: 1 0 0;
 
     overflow-y: auto;
 }

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;
 }

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;
 }
 

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 {