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

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

@@ -213,13 +213,12 @@ limitations under the License.
 
 .mx_GroupView_membershipSection {
     color: $greyed-fg-color;
+    margin-top: 10px;
 }
 
 .mx_GroupView_membershipSubSection {
     justify-content: space-between;
     display: flex;
-    margin-top: 2px;
-    margin-bottom: 2px;
 }
 
 .mx_GroupView_membershipSection_description {
@@ -227,6 +226,10 @@ limitations under the License.
     line-height: 34px;
 }
 
+.mx_GroupView_membershipSection_description .mx_BaseAvatar {
+    margin-right: 10px;
+}
+
 .mx_GroupView_membershipSection .mx_GroupView_textButton {
     margin-right: 0px;
     margin-top: 0px;
@@ -300,10 +303,22 @@ limitations under the License.
 }
 
 .mx_GroupView_body .gm-scroll-view > *{
-    margin: 0px 50px 11px 68px;
+    margin: 11px 50px 0px 68px;
 }
 
 .mx_GroupView_groupDesc textarea {
-    width: 50%;
+    width: 100%;
+    max-width: 100%;
     height: 150px;
 }
+
+.mx_GroupView_groupDesc_placeholder {
+    background-color: $info-plinth-bg-color;
+    color: $info-plinth-fg-color;
+    border-radius: 10px;
+    text-align: center;
+
+    cursor: pointer;
+    padding: 100px 20px;
+    margin: 20px 0px;
+}

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

@@ -87,8 +87,8 @@ limitations under the License.
 }
 
 .mx_MyGroups_placeholder {
-    background-color: $group-my-groups-placeholder-bg;
-    color: $group-my-groups-placeholder-fg;
+    background-color: $info-plinth-bg-color;
+    color: $info-plinth-fg-color;
     line-height: 400px;
     border-radius: 10px;
     text-align: center;