OpenCloud
/
element-web
mirror of https://github.com/vector-im/element-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix community right panel button regression 

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
pull/21833/head
Michael Telatynski 2020-07-20 14:47:06 +01:00
parent 7996013cd5
commit 8aceb11992
3 changed files with 18 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
res/css/views/rooms/_MemberList.scss
View File

@ -70,15 +70,11 @@ limitations under the License.
} }
} }
.mx_MemberList_wrapper { .mx_MemberList_wrapper {
padding: 10px; padding: 10px;
} }
.mx_MemberList_invite {
.mx_MemberList_invite,
.mx_RightPanel_invite {
flex: 0 0 auto; flex: 0 0 auto;
position: relative; position: relative;
background-color: $button-bg-color; background-color: $button-bg-color;
@ -88,11 +84,6 @@ limitations under the License.
justify-content: center; justify-content: center;
color: $button-fg-color; color: $button-fg-color;
font-weight: 600; font-weight: 600;
.mx_RightPanel_icon {
padding-right: 5px;
padding-top: 2px;
}
} }
.mx_MemberList_invite.mx_AccessibleButton_disabled { .mx_MemberList_invite.mx_AccessibleButton_disabled {
@ -107,3 +98,11 @@ limitations under the License.
background-size: 20px; background-size: 20px;
padding: 8px 0 8px 25px; padding: 8px 0 8px 25px;
} }
.mx_MemberList_inviteCommunity span {
background-image: url('$(res)/img/icon-invite-people.svg');
}
.mx_MemberList_addRoomToCommunity span {
background-image: url('$(res)/img/icons-room-add.svg');
}

16
src/components/views/groups/GroupMemberList.js
View File

@ -211,15 +211,13 @@ export default createReactClass({
let inviteButton; let inviteButton;
if (GroupStore.isUserPrivileged(this.props.groupId)) { if (GroupStore.isUserPrivileged(this.props.groupId)) {
inviteButton = ( inviteButton = (
<AccessibleButton <AccessibleButton
className="mx_RightPanel_invite" className="mx_MemberList_invite mx_MemberList_inviteCommunity"
onClick={this.onInviteToGroupButtonClick} onClick={this.onInviteToGroupButtonClick}
> >
<div className="mx_RightPanel_icon" > <span>{ _t('Invite to this community') }</span>
<TintableSvg src={require("../../../../res/img/icon-invite-people.svg")} width="18" height="14" /> </AccessibleButton>
</div> );
<div className="mx_RightPanel_message">{ _t('Invite to this community') }</div>
</AccessibleButton>);
} }
return ( return (

7
src/components/views/groups/GroupRoomList.js
View File

@ -135,13 +135,10 @@ export default createReactClass({
if (GroupStore.isUserPrivileged(this.props.groupId)) { if (GroupStore.isUserPrivileged(this.props.groupId)) {
inviteButton = ( inviteButton = (
<AccessibleButton <AccessibleButton
className="mx_RightPanel_invite" className="mx_MemberList_invite mx_MemberList_addRoomToCommunity"
onClick={this.onAddRoomToGroupButtonClick} onClick={this.onAddRoomToGroupButtonClick}
> >
<div className="mx_RightPanel_icon" > <span>{ _t('Add rooms to this community') }</span>
<TintableSvg src={require("../../../../res/img/icons-room-add.svg")} width="18" height="14" />
</div>
<div className="mx_RightPanel_message">{ _t('Add rooms to this community') }</div>
</AccessibleButton> </AccessibleButton>
); );
} }