mirrors/element-web
1
0
Fork 0
mirror of https://github.com/vector-im/element-web.git synced 2025-09-01 20:01:19 +02:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into develop

Browse Source
This commit is contained in:
Weblate 2018-10-23 09:18:12 +00:00
commit 87ae1ce458
3 changed files with 2 additions and 5 deletions
Show Stats 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}