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

Use LoginHeader everywhere

pull/21833/head
Kegan Dougal 2015-12-01 16:29:58 +00:00
parent 05a6121934
commit 673b01267a
4 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/structures/RoomView.js
View File

@ -44,7 +44,7 @@ var INITIAL_SIZE = 20;
module.exports = React.createClass({ module.exports = React.createClass({
displayName: 'RoomView', displayName: 'RoomView',
propTypes: { propTypes: {
ConferenceHandler: React.PropTypes.any // VectorConferenceHandler ConferenceHandler: React.PropTypes.any
}, },
getInitialState: function() { getInitialState: function() {

5
src/components/structures/login/PostRegistration.js
View File

@ -58,12 +58,11 @@ module.exports = React.createClass({
render: function() { render: function() {
var ChangeDisplayName = sdk.getComponent('settings.ChangeDisplayName'); var ChangeDisplayName = sdk.getComponent('settings.ChangeDisplayName');
var ChangeAvatar = sdk.getComponent('settings.ChangeAvatar'); var ChangeAvatar = sdk.getComponent('settings.ChangeAvatar');
var LoginHeader = sdk.getComponent('login.LoginHeader');
return ( return (
<div className="mx_Login"> <div className="mx_Login">
<div className="mx_Login_box"> <div className="mx_Login_box">
<div className="mx_Login_logo"> <LoginHeader />
<img src="img/logo.png" width="249" height="78" alt="vector"/>
</div>
<div className="mx_Login_profile"> <div className="mx_Login_profile">
Set a display name: Set a display name:
<ChangeDisplayName /> <ChangeDisplayName />

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

@ -234,12 +234,11 @@ module.exports = React.createClass({
}, },
render: function() { render: function() {
var LoginHeader = sdk.getComponent('login.LoginHeader');
return ( return (
<div className="mx_Login"> <div className="mx_Login">
<div className="mx_Login_box"> <div className="mx_Login_box">
<div className="mx_Login_logo"> <LoginHeader />
<img src="img/logo.png" width="249" height="78" alt="vector"/>
</div>
{this._getRegisterContentJsx()} {this._getRegisterContentJsx()}
</div> </div>
</div> </div>

2
src/components/views/rooms/RoomList.js
View File

@ -29,7 +29,7 @@ module.exports = React.createClass({
displayName: 'RoomList', displayName: 'RoomList',
propTypes: { propTypes: {
ConferenceHandler: React.PropTypes.any, // e.g. VectorConferenceHandler ConferenceHandler: React.PropTypes.any,
collapsed: React.PropTypes.bool, collapsed: React.PropTypes.bool,
currentRoom: React.PropTypes.string currentRoom: React.PropTypes.string
}, },