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

Merge pull request #680 from matrix-org/luke/rts-fix-reg-icon 

Use new method of getting team icon
pull/21833/head
David Baker 2017-02-10 16:39:11 +00:00 committed by GitHub
parent a5a43bcd93 69add8fd64
commit 33fc4f7d8d
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/components/structures/login/Registration.js
View File

@ -426,7 +426,12 @@ module.exports = React.createClass({
return ( return (
<div className="mx_Login"> <div className="mx_Login">
<div className="mx_Login_box"> <div className="mx_Login_box">
<LoginHeader icon={this.state.teamSelected ? this.state.teamSelected.icon : null}/> <LoginHeader
icon={this.state.teamSelected ?
this.props.teamServerConfig.teamServerURL + "/static/common/" +
this.state.teamSelected.domain + "/icon.png" :
null}
/>
{this._getRegisterContentJsx()} {this._getRegisterContentJsx()}
<LoginFooter /> <LoginFooter />
</div> </div>