Merge remote-tracking branch 'origin/develop' into matthew/status

src/skins/vector/css/matrix-react-sdk/structures/_GroupView.scss

@@ -33,10 +33,12 @@ limitations under the License.
     min-height: 70px;
     align-items: center;
     display: flex;
+    padding-bottom: 10px;
 }
 
 .mx_GroupView_header_view {
     border-bottom: 1px solid $primary-hairline-color;
+    padding-bottom: 0px;
 }
 
 .mx_GroupView_header_avatar, .mx_GroupView_header_info {
@@ -159,8 +161,12 @@ limitations under the License.
     user-select: none;
 }
 
-.mx_GroupView_rooms_header h3 {
-    margin-bottom: 10px
+.mx_GroupView h3 {
+    text-transform: uppercase;
+    color: $h3-color;
+    font-weight: 600;
+    font-size: 13px;
+    margin-bottom: 10px;
 }
 
 .mx_GroupView_rooms_header .mx_AccessibleButton {
@@ -169,15 +175,24 @@ limitations under the License.
     height: 24px;
 }
 
-.mx_GroupView_rooms_header_addButton {
-    display: inline-block;
+.mx_GroupView_group {
+    border-top: 1px solid $primary-hairline-color;
 }
 
-.mx_GroupView_rooms_header_addButton object {
+.mx_GroupView_group_disabled {
+    opacity: 0.3;
     pointer-events: none;
 }
 
-.mx_GroupView_rooms_header_addButton_label {
+.mx_GroupView_rooms_header_addRow_button {
+    display: inline-block;
+}
+
+.mx_GroupView_rooms_header_addRow_button object {
+    pointer-events: none;
+}
+
+.mx_GroupView_rooms_header_addRow_label {
     display: inline-block;
     vertical-align: top;
     line-height: 24px;
@@ -222,14 +237,6 @@ limitations under the License.
     user-select: none;
 }
 
-.mx_GroupView_memberSettings h3 {
-    text-transform: uppercase;
-    color: $h3-color;
-    font-weight: 600;
-    font-size: 13px;
-    margin-bottom: 10px;
-}
-
 .mx_GroupView_memberSettings input {
     margin-right: 6px;
 }

src/skins/vector/css/matrix-react-sdk/structures/_RoomView.scss

@@ -68,7 +68,7 @@ limitations under the License.
     min-width: 0px;
     max-width: 960px;
     width: 100%;
-    margin: auto;
+    margin: 0px auto;
 
     overflow: auto;
     border-bottom: 1px solid $primary-hairline-color;
@@ -80,17 +80,32 @@ limitations under the License.
     max-width: 1920px ! important;
 }
 
-.mx_RoomView_topUnreadMessagesBar {
+
+.mx_RoomView_body {
+    order: 3;
+    flex: 1 1 0;
+    flex-direction: column;
+    display: flex;
+}
+
+.mx_RoomView_body .mx_RoomView_topUnreadMessagesBar {
+    order: 1;
+}
+
+.mx_RoomView_body .mx_RoomView_messagePanel {
+    order: 2;
+}
+
+.mx_RoomView_body .mx_RoomView_statusArea {
     order: 3;
 }
 
-.mx_RoomView_messagePanel {
+.mx_RoomView_body .mx_MessageComposer {
     order: 4;
+}
 
-    flex: 1 1 0;
-
+.mx_RoomView_messagePanel {
     width: 100%;
-
     overflow-y: auto;
 }
 
@@ -131,18 +146,6 @@ limitations under the License.
     clear: both;
 }
 
-.mx_RoomView_invitePrompt {
-    order: 2;
-
-    min-width: 0px;
-    max-width: 960px;
-    width: 100%;
-    margin: auto;
-
-    margin-top: 12px;
-    margin-bottom: 12px;
-}
-
 li.mx_RoomView_myReadMarker_container {
     height: 0px;
     margin: 0px;
@@ -160,8 +163,6 @@ hr.mx_RoomView_myReadMarker {
 }
 
 .mx_RoomView_statusArea {
-    order: 5;
-
     width: 100%;
     flex: 0 0 auto;
 
@@ -236,8 +237,6 @@ hr.mx_RoomView_myReadMarker {
 }
 
 .mx_RoomView .mx_MessageComposer {
-    order: 6;
-
     width: 100%;
     flex: 0 0 auto;
     margin-right: 2px;