Merge pull request #2223 from matrix-org/travis/fix-group-members
Show the group member list againpull/21833/head
						commit
						5206719663
					
				|  | @ -111,6 +111,3 @@ limitations under the License. | |||
|     width: 100%; | ||||
| } | ||||
| 
 | ||||
| .mx_MemberList_outerWrapper { | ||||
|     height: 0px; | ||||
| } | ||||
|  |  | |||
|  | @ -165,7 +165,7 @@ export default React.createClass({ | |||
|         return ( | ||||
|             <div className="mx_MemberList"> | ||||
|                 { inputBox } | ||||
|                 <GeminiScrollbarWrapper autoshow={true} className="mx_MemberList_outerWrapper"> | ||||
|                 <GeminiScrollbarWrapper autoshow={true}> | ||||
|                     { joined } | ||||
|                     { invited } | ||||
|                 </GeminiScrollbarWrapper> | ||||
|  |  | |||
|  | @ -447,7 +447,7 @@ module.exports = React.createClass({ | |||
|         return ( | ||||
|             <div className="mx_MemberList"> | ||||
|                 { 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} | ||||
|                             createOverflowElement={this._createOverflowTileJoined} | ||||
|                             getChildren={this._getChildrenJoined} | ||||
|  |  | |||
		Loading…
	
		Reference in New Issue
	
	 David Baker
						David Baker