imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix up RoomSettings somewhat and implement room colors

Browse source
This commit is contained in:
Matthew Hodgson 2016-01-08 03:22:38 +00:00
parent 8170288acb
commit ef00a1624d
7 changed files with 231 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/components/views/settings/ChangeAvatar.js
View file

@ -111,13 +111,14 @@ module.exports = React.createClass({
// Having just set an avatar we just display that since it will take a little
// time to propagate through to the RoomAvatar.
if (this.props.room && !this.avatarSet) {
avatarImg = <RoomAvatar room={this.props.room} width='320' height='240' resizeMethod='scale' />;
avatarImg = <RoomAvatar room={this.props.room} width='240' height='240' resizeMethod='crop' />;
} else {
var style = {
maxWidth: 320,
maxWidth: 240,
maxHeight: 240,
objectFit: 'cover',
};
avatarImg = <img src={this.state.avatarUrl} style={style} />;
avatarImg = <img className="mx_RoomAvatar" src={this.state.avatarUrl} style={style} />;
}
var uploadSection;