Merge branch 'develop' into matthew/settings

src/skins/vector/css/molecules/EventTile.css

@@ -106,6 +106,11 @@ limitations under the License.
     padding: 4px;
 }
 
+.mx_MessageTile_searchHighlight a {
+    background-color: #76cfa6;
+    color: #fff;    
+}
+
 .mx_EventTile_sending {
     color: #ddd;
 }

src/skins/vector/css/molecules/RoomHeader.css

@@ -127,7 +127,6 @@ limitations under the License.
 .mx_RoomHeader_searchStatus {
     display: inline-block;
     font-weight: normal;
-    overflow-y: hidden;
     opacity: 0.6;
 }
 

src/skins/vector/css/molecules/voip/IncomingCallbox.css

@@ -19,11 +19,12 @@ limitations under the License.
     border: 1px solid #a4a4a4;
     border-radius: 8px;
     background-color: #fff;
-    position: absolute;
+    position: fixed;
     z-index: 1000;
-    left: 235px;
-    top: 155px;
     padding: 6px;
+    margin-top: -3px;
+    margin-left: -20px;
+    width: 200px;
 }
 
 .mx_IncomingCallBox_chevron {
@@ -39,14 +40,13 @@ limitations under the License.
 }
 
 .mx_IncomingCallBox_buttons {
-    display: table-row;
+    display: flex;
 }
 
 .mx_IncomingCallBox_buttons_cell {
     vertical-align: middle;
-    display: table-cell;
     padding: 6px;
-    width: 50%;
+    flex: 1;
 }
 
 .mx_IncomingCallBox_buttons_decline,
@@ -57,6 +57,7 @@ limitations under the License.
     line-height: 36px;
     border-radius: 36px;
     color: #fff;
+    margin: auto;
 }
 
 .mx_IncomingCallBox_buttons_decline {

src/skins/vector/css/organisms/RoomList.css

@@ -17,6 +17,7 @@ limitations under the License.
 .mx_RoomList {
     padding-top: 24px;
     padding-bottom: 12px;
+    min-height: 400px;
 }
 
 .mx_RoomList_expandButton {

src/skins/vector/css/organisms/RoomSubList.css

@@ -20,11 +20,6 @@ limitations under the License.
     width: 100%;
 }
 
-.mx_RoomSubList_bottommost {
-    /* XXX: this should really be 100% of the RoomList height, but can't seem to get at it */
-    min-height: 400px;
-}
-
 .mx_RoomSubList_label {
     text-transform: uppercase;
     color: #3d3b39;