From e5c128fcb8cf7c800b0eb60f846e0ccf3abdef40 Mon Sep 17 00:00:00 2001
From: Luke Barnard <lukeb@openmarket.com>
Date: Wed, 18 Oct 2017 13:47:59 +0100
Subject: [PATCH] Move group ui buttons to group settings
---
.../structures/_GroupView.scss | 32 +++++++++++++++----
.../views/rooms/_RoomHeader.scss | 4 +++
2 files changed, 29 insertions(+), 7 deletions(-)
diff --git a/src/skins/vector/css/matrix-react-sdk/structures/_GroupView.scss b/src/skins/vector/css/matrix-react-sdk/structures/_GroupView.scss
index 8bc7eb83..7ffb39db 100644
--- a/src/skins/vector/css/matrix-react-sdk/structures/_GroupView.scss
+++ b/src/skins/vector/css/matrix-react-sdk/structures/_GroupView.scss
@@ -134,9 +134,7 @@ limitations under the License.
top: 5px;
}
-.mx_GroupView_body {
- display: flex;
- flex-direction: column;
+.mx_GroupView_body {
flex-grow: 1;
}
@@ -181,7 +179,6 @@ limitations under the License.
}
.mx_GroupView_membershipSection {
- margin-bottom: 11px;
color: $greyed-fg-color;
}
@@ -203,6 +200,23 @@ limitations under the License.
margin-left: 8px;
}
+.mx_GroupView_memberSettings_toggle label {
+ cursor: pointer;
+ 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;
+}
+
.mx_GroupView_featuredThings {
margin-top: 20px;
}
@@ -260,7 +274,11 @@ limitations under the License.
display: none;
}
-.mx_GroupView_editLongDesc {
- width: 100%;
- height: 150px;
+.mx_GroupView_body .gm-scroll-view > *{
+ margin: 0px 50px 11px 68px;
}
+
+.mx_GroupView_groupDesc textarea {
+ width: 50%;
+ height: 150px;
+}
\ No newline at end of file
diff --git a/src/skins/vector/css/matrix-react-sdk/views/rooms/_RoomHeader.scss b/src/skins/vector/css/matrix-react-sdk/views/rooms/_RoomHeader.scss
index 05cdfba8..b16cf8b6 100644
--- a/src/skins/vector/css/matrix-react-sdk/views/rooms/_RoomHeader.scss
+++ b/src/skins/vector/css/matrix-react-sdk/views/rooms/_RoomHeader.scss
@@ -60,6 +60,10 @@ limitations under the License.
padding-right: 12px;
}
+.mx_RoomHeader_textButton_danger {
+ background-color: $warning-color;
+}
+
.mx_RoomHeader_cancelButton {
order: 2;
cursor: pointer;