From 6fc173eaa9793bcbc2d6b37c0d4df1cecc5771a1 Mon Sep 17 00:00:00 2001
From: Luke Barnard <luke@matrix.org>
Date: Mon, 27 Nov 2017 18:59:33 +0000
Subject: [PATCH] CSS required for moving group publication toggles to
UserSettings
See https://github.com/matrix-org/matrix-react-sdk/pull/1634
---
src/skins/vector/css/_components.scss | 4 +-
.../views/groups/_GroupPublicityToggle.scss | 42 +++++++++++++++++++
.../views/groups/_GroupUserSettings.scss | 22 ++++++++++
3 files changed, 67 insertions(+), 1 deletion(-)
create mode 100644 src/skins/vector/css/matrix-react-sdk/views/groups/_GroupPublicityToggle.scss
create mode 100644 src/skins/vector/css/matrix-react-sdk/views/groups/_GroupUserSettings.scss
diff --git a/src/skins/vector/css/_components.scss b/src/skins/vector/css/_components.scss
index a59f2f52..67ca0966 100644
--- a/src/skins/vector/css/_components.scss
+++ b/src/skins/vector/css/_components.scss
@@ -38,7 +38,9 @@
@import "./matrix-react-sdk/views/elements/_RichText.scss";
@import "./matrix-react-sdk/views/elements/_RoleButton.scss";
@import "./matrix-react-sdk/views/elements/_ToolTipButton.scss";
+@import "./matrix-react-sdk/views/groups/_GroupPublicityToggle.scss";
@import "./matrix-react-sdk/views/groups/_GroupRoomList.scss";
+@import "./matrix-react-sdk/views/groups/_GroupUserSettings.scss";
@import "./matrix-react-sdk/views/login/_InteractiveAuthEntryComponents.scss";
@import "./matrix-react-sdk/views/login/_ServerConfig.scss";
@import "./matrix-react-sdk/views/messages/_MEmoteBody.scss";
@@ -81,7 +83,7 @@
@import "./vector-web/structures/_RoomSubList.scss";
@import "./vector-web/structures/_ViewSource.scss";
@import "./vector-web/views/context_menus/_MessageContextMenu.scss";
-@import "vector-web/views/context_menus/_PresenceContextMenuOption.scss";
+@import "./vector-web/views/context_menus/_PresenceContextMenuOption.scss";
@import "./vector-web/views/context_menus/_RoomTileContextMenu.scss";
@import "./vector-web/views/dialogs/_ChangelogDialog.scss";
@import "./vector-web/views/dialogs/_DevtoolsDialog.scss";
diff --git a/src/skins/vector/css/matrix-react-sdk/views/groups/_GroupPublicityToggle.scss b/src/skins/vector/css/matrix-react-sdk/views/groups/_GroupPublicityToggle.scss
new file mode 100644
index 00000000..3ea4aa07
--- /dev/null
+++ b/src/skins/vector/css/matrix-react-sdk/views/groups/_GroupPublicityToggle.scss
@@ -0,0 +1,42 @@
+/*
+Copyright 2017 New Vector Ltd
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+.mx_GroupPublicity_toggle {
+ display: flex;
+ align-items: center;
+ margin: 8px;
+}
+
+.mx_GroupPublicity_toggle > label {
+ display: flex;
+ align-items: flex-start;
+}
+
+.mx_GroupPublicity_toggle > label,
+.mx_GroupPublicity_toggle .mx_GroupTile {
+ width: 50%;
+}
+
+.mx_GroupPublicity_toggle input {
+ margin-right: 8px;
+ vertical-align: -4px;
+}
+
+.mx_GroupPublicity_toggle .mx_GroupTile {
+ display: flex;
+ align-items: flex-start;
+ cursor: pointer;
+}
diff --git a/src/skins/vector/css/matrix-react-sdk/views/groups/_GroupUserSettings.scss b/src/skins/vector/css/matrix-react-sdk/views/groups/_GroupUserSettings.scss
new file mode 100644
index 00000000..8083306b
--- /dev/null
+++ b/src/skins/vector/css/matrix-react-sdk/views/groups/_GroupUserSettings.scss
@@ -0,0 +1,22 @@
+/*
+Copyright 2017 New Vector Ltd
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+.mx_GroupUserSettings_groupPublicity_scrollbox {
+ height: 200px;
+ border: 1px solid $primary-hairline-color;
+ border-radius: 3px;
+ margin-right: 32px;
+}