From a1e3ec1d1961283ce710972d14d32d4b280af20f Mon Sep 17 00:00:00 2001 From: wmwragg Date: Thu, 15 Sep 2016 11:30:46 +0100 Subject: [PATCH 1/3] Added query to CSS and removed nolonger used SearchableEntityList --- .../views/rooms/MemberList.css | 28 ++++++++++++++----- 1 file changed, 21 insertions(+), 7 deletions(-) diff --git a/src/skins/vector/css/matrix-react-sdk/views/rooms/MemberList.css b/src/skins/vector/css/matrix-react-sdk/views/rooms/MemberList.css index d2988cb7..e9a694e7 100644 --- a/src/skins/vector/css/matrix-react-sdk/views/rooms/MemberList.css +++ b/src/skins/vector/css/matrix-react-sdk/views/rooms/MemberList.css @@ -52,15 +52,29 @@ limitations under the License. flex: 1 1 0px; } -.mx_MemberList .mx_SearchableEntityList { - order: 1; - flex: 0 0 auto; - -webkit-flex: 0 0 auto; +.mx_MemberList_query { + font-family: 'Open Sans', Arial, Helvetica, Sans-Serif; + border-radius: 3px; + border: 1px solid #f0f0f0; + padding: 9px; + color: #454545; + background-color: #fff; + margin-left: 3px; + font-size: 15px; + margin-bottom: 8px; + width: 189px; } -.mx_MemberList .mx_SearchableEntityList_expanded { - flex: 1 0 0; - -webkit-flex: 1 0 0; +.mx_MemberList_query::-moz-placeholder { + color: #454545; + opacity: 0.5; + font-size: 12px; +} + +.mx_MemberList_query::-webkit-input-placeholder { + color: #454545; + opacity: 0.5; + font-size: 12px; } .mx_MemberList_joined { From f43530e1efd09ca99fe6e02eaf84532b78942728 Mon Sep 17 00:00:00 2001 From: wmwragg Date: Thu, 15 Sep 2016 11:39:21 +0100 Subject: [PATCH 2/3] Tweaked font size to match the design spec --- .../vector/css/matrix-react-sdk/views/rooms/MemberList.css | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/skins/vector/css/matrix-react-sdk/views/rooms/MemberList.css b/src/skins/vector/css/matrix-react-sdk/views/rooms/MemberList.css index e9a694e7..7d383606 100644 --- a/src/skins/vector/css/matrix-react-sdk/views/rooms/MemberList.css +++ b/src/skins/vector/css/matrix-react-sdk/views/rooms/MemberList.css @@ -60,7 +60,7 @@ limitations under the License. color: #454545; background-color: #fff; margin-left: 3px; - font-size: 15px; + font-size: 14px; margin-bottom: 8px; width: 189px; } @@ -68,13 +68,13 @@ limitations under the License. .mx_MemberList_query::-moz-placeholder { color: #454545; opacity: 0.5; - font-size: 12px; + font-size: 14px; } .mx_MemberList_query::-webkit-input-placeholder { color: #454545; opacity: 0.5; - font-size: 12px; + font-size: 14px; } .mx_MemberList_joined { From 3907da064e36409a4c58aa2d84a95f75f2563d8b Mon Sep 17 00:00:00 2001 From: wmwragg Date: Thu, 15 Sep 2016 11:46:35 +0100 Subject: [PATCH 3/3] Removed no longer used MultiInviteDialog, as it's now been replaced with the ChatInviteDialog --- .../views/dialogs/MultiInviteDialog.css | 36 ------------------- 1 file changed, 36 deletions(-) delete mode 100644 src/skins/vector/css/matrix-react-sdk/views/dialogs/MultiInviteDialog.css diff --git a/src/skins/vector/css/matrix-react-sdk/views/dialogs/MultiInviteDialog.css b/src/skins/vector/css/matrix-react-sdk/views/dialogs/MultiInviteDialog.css deleted file mode 100644 index e9471890..00000000 --- a/src/skins/vector/css/matrix-react-sdk/views/dialogs/MultiInviteDialog.css +++ /dev/null @@ -1,36 +0,0 @@ -/* -Copyright 2016 OpenMarket 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_MultiInviteDialog ul { - height: 300px; - overflow-y: auto; -} - -.mx_MultiInviteDialog li { - list-style-type: none; -} - -.mx_MultiInviteDialog_statusText { - text-indent: 20px; -} - -.mx_MultiInviteDialog p.error { - color: #ff0064; -} - -.mx_MultiInviteDialog p.invited { - color: #76cfa6; -}