From 014464d82b08cfb0f8f6b20f4eeba5052b4ca09d Mon Sep 17 00:00:00 2001 From: Luke Barnard Date: Fri, 29 Sep 2017 17:58:42 +0100 Subject: [PATCH 1/2] CSS for "remove" button on GroupRoomTile --- src/skins/vector/css/_components.scss | 1 + .../views/groups/_GroupRoomList.scss | 30 +++++++++++++++++++ 2 files changed, 31 insertions(+) create mode 100644 src/skins/vector/css/matrix-react-sdk/views/groups/_GroupRoomList.scss diff --git a/src/skins/vector/css/_components.scss b/src/skins/vector/css/_components.scss index 61bfa104aa..dfded1ac61 100644 --- a/src/skins/vector/css/_components.scss +++ b/src/skins/vector/css/_components.scss @@ -33,6 +33,7 @@ @import "./matrix-react-sdk/views/elements/_RichText.scss"; @import "./matrix-react-sdk/views/elements/_RoleButton.scss"; @import "./matrix-react-sdk/views/groups/_GroupInviteTile.scss"; +@import "./matrix-react-sdk/views/groups/_GroupRoomList.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"; diff --git a/src/skins/vector/css/matrix-react-sdk/views/groups/_GroupRoomList.scss b/src/skins/vector/css/matrix-react-sdk/views/groups/_GroupRoomList.scss new file mode 100644 index 0000000000..c7cecfc2d4 --- /dev/null +++ b/src/skins/vector/css/matrix-react-sdk/views/groups/_GroupRoomList.scss @@ -0,0 +1,30 @@ +/* +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_GroupRoomTile_delete { + opacity: 0.4; + position: relative; + top: 6px; + right: 10px; + cursor: pointer; + + display: none; +} + +.mx_GroupRoomTile:hover > .mx_GroupRoomTile_delete { + display: initial; +} + From 195395e7eeea522f1147ff4c991c6a7328217634 Mon Sep 17 00:00:00 2001 From: Luke Barnard Date: Tue, 3 Oct 2017 11:14:43 +0100 Subject: [PATCH 2/2] Adjust CSS for groupRoomTile and add QuestionDialog right padding (The confirmation dialog for removing a room needed padding) --- src/skins/vector/css/_components.scss | 1 + .../views/dialogs/_QuestionDialog.scss | 18 ++++++++++++++++++ .../views/groups/_GroupRoomList.scss | 8 +++++++- .../views/rooms/_EntityTile.scss | 3 +-- 4 files changed, 27 insertions(+), 3 deletions(-) create mode 100644 src/skins/vector/css/matrix-react-sdk/views/dialogs/_QuestionDialog.scss diff --git a/src/skins/vector/css/_components.scss b/src/skins/vector/css/_components.scss index dfded1ac61..9921aa7e06 100644 --- a/src/skins/vector/css/_components.scss +++ b/src/skins/vector/css/_components.scss @@ -21,6 +21,7 @@ @import "./matrix-react-sdk/views/dialogs/_ConfirmUserActionDialog.scss"; @import "./matrix-react-sdk/views/dialogs/_CreateGroupDialog.scss"; @import "./matrix-react-sdk/views/dialogs/_EncryptedEventDialog.scss"; +@import "./matrix-react-sdk/views/dialogs/_QuestionDialog.scss"; @import "./matrix-react-sdk/views/dialogs/_SetMxIdDialog.scss"; @import "./matrix-react-sdk/views/dialogs/_UnknownDeviceDialog.scss"; @import "./matrix-react-sdk/views/elements/_AccessibleButton.scss"; diff --git a/src/skins/vector/css/matrix-react-sdk/views/dialogs/_QuestionDialog.scss b/src/skins/vector/css/matrix-react-sdk/views/dialogs/_QuestionDialog.scss new file mode 100644 index 0000000000..3d47f17592 --- /dev/null +++ b/src/skins/vector/css/matrix-react-sdk/views/dialogs/_QuestionDialog.scss @@ -0,0 +1,18 @@ +/* +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_QuestionDialog { + padding-right: 58px; +} diff --git a/src/skins/vector/css/matrix-react-sdk/views/groups/_GroupRoomList.scss b/src/skins/vector/css/matrix-react-sdk/views/groups/_GroupRoomList.scss index c7cecfc2d4..91f0c34789 100644 --- a/src/skins/vector/css/matrix-react-sdk/views/groups/_GroupRoomList.scss +++ b/src/skins/vector/css/matrix-react-sdk/views/groups/_GroupRoomList.scss @@ -14,9 +14,15 @@ See the License for the specific language governing permissions and limitations under the License. */ +.mx_GroupRoomTile { + position: relative; + color: $primary-fg-color; + cursor: pointer; +} + .mx_GroupRoomTile_delete { opacity: 0.4; - position: relative; + position: absolute; top: 6px; right: 10px; cursor: pointer; diff --git a/src/skins/vector/css/matrix-react-sdk/views/rooms/_EntityTile.scss b/src/skins/vector/css/matrix-react-sdk/views/rooms/_EntityTile.scss index 948521ce0a..de6c343bfe 100644 --- a/src/skins/vector/css/matrix-react-sdk/views/rooms/_EntityTile.scss +++ b/src/skins/vector/css/matrix-react-sdk/views/rooms/_EntityTile.scss @@ -14,8 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -.mx_EntityTile, -.mx_GroupRoomTile { +.mx_EntityTile { display: table-row; position: relative; color: $primary-fg-color;