Merge branch 'develop' into matthew/notif-panel

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

@@ -48,7 +48,7 @@ limitations under the License.
 .mx_ChatInviteDialog_queryList {
     position: absolute;
     background-color: #fff;
-    width: 470px;
+    width: 485px;
     max-height: 116px;
     overflow-y: scroll;
 	border-radius: 3px;

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

@@ -73,3 +73,13 @@ limitations under the License.
     margin-left: 8px;
     line-height: 23px;
 }
+
+.mx_MemberInfo_createRoom {
+    cursor: pointer;
+}
+
+.mx_MemberInfo_createRoom_label {
+    width: 160px ! important;
+    cursor: pointer;
+}
+

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

@@ -35,5 +35,5 @@ limitations under the License.
 
 /* Make sure the scrollbar is above the sticky headers from RoomList */
 .mx_RoomList_scrollbar .gm-scrollbar.-vertical {
-    z-index: 5;
+    z-index: 6;
 }

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

@@ -36,6 +36,14 @@ limitations under the License.
     height: 24px;
 }
 
+.mx_RightPanel .mx_RoomTile_nameContainer {
+    width: 170px;
+}
+
+.mx_RoomTile_avatar_container {
+    position: relative;
+}
+
 .mx_RoomTile_avatar {
     display: inline-block;
     padding-top: 5px;
@@ -47,6 +55,14 @@ limitations under the License.
     vertical-align: middle;
 }
 
+.mx_RoomTile_dm {
+    display: block;
+    position: absolute;
+    bottom: 0;
+    right: -5px;
+    z-index: 2;
+}
+
 .mx_RoomTile:hover .mx_RoomTile_avatar_container:before,
 .mx_RoomTile_avatar_container.mx_RoomTile_avatar_roomTagMenu:before {
     display: block;
@@ -55,7 +71,6 @@ limitations under the License.
     border-radius: 40px;
     background-image: url("img/icons_ellipsis.svg");
     background-size: 25px;
-    left: 15px;
     width: 24px;
     height: 24px;
     z-index: 4;
@@ -68,11 +83,11 @@ limitations under the License.
     content: "";
     border-radius: 40px;
     background: #4A4A4A;
-    top: 5px;
+    bottom: 0;
     width: 24px;
     height: 24px;
     opacity: 0.6;
-    z-index: 2;
+    z-index: 1;
 }
 
 .collapsed .mx_RoomTile:hover .mx_RoomTile_avatar_container:before {