mad-star-studio/element-web
2
0
Fork 0
Code Pull requests Activity

Merge branch 'develop' into kegan/reg-refactor

Browse source
This commit is contained in:
Kegan Dougal 2015-11-19 09:50:08 +00:00
commit 5f57cd9559
17 changed files with 442 additions and 39 deletions
src/components/login
Login.js

6
src/components/login/Login.js
View file

@ -165,11 +165,11 @@ module.exports = React.createClass({displayName: 'Login',
<div className="mx_Login">
<div className="mx_Login_box">
<div className="mx_Login_logo">
<img src="img/logo.png" width="249" height="78" alt="vector"/>
<img src="img/logo.png" width="249" height="78" alt="vector"/>
</div>
<div>
<h2>Sign in</h2>
{this.componentForStep(this._getCurrentFlowStep())}
{ this.componentForStep(this._getCurrentFlowStep()) }
<ServerConfig ref="serverConfig"
withToggleButton={true}
defaultHsUrl={this.props.homeserverUrl}
@ -179,7 +179,7 @@ module.exports = React.createClass({displayName: 'Login',
delayTimeMs={1000}/>
<div className="mx_Login_error">
{ loader }
{this.state.errorText}
{ this.state.errorText }
</div>
<a className="mx_Login_create" onClick={this.props.onRegisterClick} href="#">
Create a new account