imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #5022 from matrix-org/t3chguy/fix/14653

Browse source 
Fix community right panel button regression
This commit is contained in:
Michael Telatynski 2020-07-20 15:18:42 +01:00 • committed by GitHub
commit b78fa9fb92
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 18 additions and 26 deletions
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');
}

17
src/components/views/groups/GroupMemberList.js
View file

@ -24,7 +24,6 @@ import GroupStore from '../../../stores/GroupStore';
import PropTypes from 'prop-types'; import PropTypes from 'prop-types';
import { showGroupInviteDialog } from '../../../GroupAddressPicker'; import { showGroupInviteDialog } from '../../../GroupAddressPicker';
import AccessibleButton from '../elements/AccessibleButton'; import AccessibleButton from '../elements/AccessibleButton';
import TintableSvg from '../elements/TintableSvg';
import {RIGHT_PANEL_PHASES} from "../../../stores/RightPanelStorePhases"; import {RIGHT_PANEL_PHASES} from "../../../stores/RightPanelStorePhases";
import AutoHideScrollbar from "../../structures/AutoHideScrollbar"; import AutoHideScrollbar from "../../structures/AutoHideScrollbar";
@ -211,15 +210,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 (

8
src/components/views/groups/GroupRoomList.js
View file

@ -21,7 +21,6 @@ import GroupStore from '../../../stores/GroupStore';
import PropTypes from 'prop-types'; import PropTypes from 'prop-types';
import { showGroupAddRoomDialog } from '../../../GroupAddressPicker'; import { showGroupAddRoomDialog } from '../../../GroupAddressPicker';
import AccessibleButton from '../elements/AccessibleButton'; import AccessibleButton from '../elements/AccessibleButton';
import TintableSvg from '../elements/TintableSvg';
import AutoHideScrollbar from "../../structures/AutoHideScrollbar"; import AutoHideScrollbar from "../../structures/AutoHideScrollbar";
const INITIAL_LOAD_NUM_ROOMS = 30; const INITIAL_LOAD_NUM_ROOMS = 30;
@ -135,13 +134,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>
); );
} }