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

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

@@ -17,19 +17,115 @@ limitations under the License.
 .mx_GroupView {
     max-width: 960px;
     width: 100%;
-    margin: 20px auto;
 }
 
 .mx_GroupView_error {
     margin: auto;
 }
 
+.mx_GroupView_header {
+    max-width: 960px;
+    margin: auto;
+    height: 70px;
+    align-items: center;
+    display: flex;
+    margin-bottom: 20px;
+}
+
+.mx_GroupView_header_view {
+    border-bottom: 1px solid #e5e5e5;
+}
+
+.mx_GroupView_header_avatar, .mx_GroupView_header_info {
+    display: table-cell;
+    vertical-align: middle;
+}
+
+.mx_GroupHeader_button {
+    margin-left: 12px;
+    cursor: pointer;
+}
+
+.mx_GroupHeader_button object {
+    // prevents clicks from being swallowed by svg in 'object' tag
+    pointer-events: none;
+}
+
+.mx_GroupView_avatarPicker {
+    position: relative;
+}
+
+.mx_GroupView_avatarPicker_edit {
+    position: absolute;
+    top: 50px;
+    left: 15px;
+}
+
+.mx_GroupView_avatarPicker .mx_Spinner {
+    width: 48px;
+    height: 48px ! important;
+}
+
+.mx_GroupView_header_leftCol {
+    flex: 1;
+}
+
+.mx_GroupView_saveButton, .mx_GroupView_cancelButton {
+    display: table-cell;
+}
+
 .mx_GroupView_header_groupid {
     font-weight: normal;
     font-size: initial;
     padding-left: 10px;
 }
 
+.mx_GroupView_header_name {
+    vertical-align: middle;
+    width: 100%;
+    height: 31px;
+    overflow: hidden;
+    color: $primary-fg-color;
+    font-weight: bold;
+    font-size: 22px;
+    padding-left: 19px;
+    padding-right: 16px;
+    /* why isn't text-overflow working? */
+    text-overflow: ellipsis;
+    border-bottom: 1px solid transparent;
+}
+
+.mx_GroupView_header_name input, .mx_GroupView_header_shortDesc input {
+    width: 400px;
+}
+
+.mx_GroupView_header_shortDesc {
+    vertical-align: bottom;
+    float: left;
+    max-height: 42px;
+    color: $settings-grey-fg-color;
+    font-weight: 300;
+    font-size: 13px;
+    padding-left: 19px;
+    margin-right: 16px;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    border-bottom: 1px solid transparent;
+}
+
+.mx_GroupView_avatarPicker_label {
+    cursor: pointer;
+}
+
+.mx_GroupView_cancelButton {
+    padding-left: 8px;
+}
+
+.mx_GroupView_cancelButton img {
+    position: relative;
+    top: 5px;
+}
+
 .mx_GroupView_featuredThings {
     margin-top: 20px;
 }
@@ -50,3 +146,12 @@ limitations under the License.
     cursor: pointer;
     display: table-cell;
 }
+
+.mx_GroupView_uploadInput {
+    display: none;
+}
+
+.mx_GroupView_editLongDesc {
+    width: 100%;
+    height: 150px;
+}