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

Merge pull request #2223 from matrix-org/travis/fix-group-members

Browse source 
Show the group member list again
This commit is contained in:
David Baker 2018-10-23 10:18:06 +01:00 • committed by GitHub
commit 5206719663
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 2 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

3
res/css/views/rooms/_MemberList.scss
View file

@ -111,6 +111,3 @@ limitations under the License.
width: 100%; width: 100%;
} }
.mx_MemberList_outerWrapper {
height: 0px;
}

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

@ -165,7 +165,7 @@ export default React.createClass({
return ( return (
<div className="mx_MemberList"> <div className="mx_MemberList">
{ inputBox } { inputBox }
<GeminiScrollbarWrapper autoshow={true} className="mx_MemberList_outerWrapper"> <GeminiScrollbarWrapper autoshow={true}>
{ joined } { joined }
{ invited } { invited }
</GeminiScrollbarWrapper> </GeminiScrollbarWrapper>

2
src/components/views/rooms/MemberList.js
View file

@ -447,7 +447,7 @@ module.exports = React.createClass({
return ( return (
<div className="mx_MemberList"> <div className="mx_MemberList">
{ inputBox } { inputBox }
<GeminiScrollbarWrapper autoshow={true} className="mx_MemberList_joined mx_MemberList_outerWrapper"> <GeminiScrollbarWrapper autoshow={true} className="mx_MemberList_joined">
<TruncatedList className="mx_MemberList_wrapper" truncateAt={this.state.truncateAtJoined} <TruncatedList className="mx_MemberList_wrapper" truncateAt={this.state.truncateAtJoined}
createOverflowElement={this._createOverflowTileJoined} createOverflowElement={this._createOverflowTileJoined}
getChildren={this._getChildrenJoined} getChildren={this._getChildrenJoined}