From 93767fa5f17dbf2a0b8d866e64a72f2b3701293b Mon Sep 17 00:00:00 2001 From: Bruno Windels Date: Mon, 10 Dec 2018 17:46:22 +0100 Subject: [PATCH] fix invite button layout --- res/css/views/rooms/_MemberList.scss | 54 +++++++++++-------- .../views/groups/GroupMemberList.js | 2 +- src/components/views/groups/GroupRoomList.js | 2 +- 3 files changed, 33 insertions(+), 25 deletions(-) diff --git a/res/css/views/rooms/_MemberList.scss b/res/css/views/rooms/_MemberList.scss index e21bc22f2e..2695ebcf31 100644 --- a/res/css/views/rooms/_MemberList.scss +++ b/res/css/views/rooms/_MemberList.scss @@ -20,10 +20,21 @@ limitations under the License. flex: 1; display: flex; flex-direction: column; -} -.mx_MemberList .mx_Spinner { - flex: 1 0 auto; + .mx_Spinner { + flex: 1 0 auto; + } + + h2 { + text-transform: uppercase; + color: $h3-color; + font-weight: 600; + font-size: 13px; + padding-left: 3px; + padding-right: 12px; + margin-top: 8px; + margin-bottom: 4px; + } } .mx_MemberList_chevron { @@ -45,23 +56,15 @@ limitations under the License. flex: 1 1 0; } -.mx_MemberList h2, .mx_GroupMemberList h2 { - text-transform: uppercase; - color: $h3-color; - font-weight: 600; - font-size: 13px; - padding-left: 3px; - padding-right: 12px; - margin-top: 8px; - margin-bottom: 4px; -} + .mx_MemberList_wrapper { padding: 10px; } -.mx_MemberList_invite { +.mx_MemberList_invite, +.mx_RightPanel_invite { flex: 0 0 auto; position: relative; background-color: $button-bg-color; @@ -69,15 +72,20 @@ limitations under the License. padding: 8px; margin: 9px; display: flex; + color: $button-fg-color; + font-weight: 600; - span { - margin: 0 auto; - background-image: url('../../img/icon-invite-people.svg'); - background-repeat: no-repeat; - background-position: center left; - padding-left: 25px; - - font-weight: 600; - color: $button-fg-color; + .mx_RightPanel_icon { + padding-right: 5px; + padding-top: 2px; } } + +.mx_MemberList_invite span { + margin: 0 auto; + background-image: url('../../img/icon-invite-people.svg'); + background-repeat: no-repeat; + background-position: center left; + padding-left: 25px; + +} diff --git a/src/components/views/groups/GroupMemberList.js b/src/components/views/groups/GroupMemberList.js index eb1412afd7..3ca4b0ad26 100644 --- a/src/components/views/groups/GroupMemberList.js +++ b/src/components/views/groups/GroupMemberList.js @@ -177,7 +177,7 @@ export default React.createClass({ if (GroupStore.isUserPrivileged(this.props.groupId)) { inviteButton = (
- +
{ _t('Invite to this community') }
); diff --git a/src/components/views/groups/GroupRoomList.js b/src/components/views/groups/GroupRoomList.js index 815f90c43d..e62752267a 100644 --- a/src/components/views/groups/GroupRoomList.js +++ b/src/components/views/groups/GroupRoomList.js @@ -133,7 +133,7 @@ export default React.createClass({ if (GroupStore.isUserPrivileged(this.props.groupId)) { inviteButton = (
- +
{ _t('Add rooms to this community') }
);