PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

Minor styling and avatar bug fixing

Browse source
This commit is contained in:
Travis Ralston 2019-01-28 11:34:21 -07:00
parent 9a524c49b1
commit ea1d6a0146
3 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
res/css/views/settings/tabs/_GeneralRoomSettingsTab.scss
View file

@ -17,3 +17,7 @@ limitations under the License.
.mx_GeneralRoomSettingsTab_profileSection {
margin-top: 10px;
}
.mx_GeneralRoomSettingsTab .mx_AliasSettings .mx_Field select {
width: 100%;
}

2
src/components/views/room_settings/AliasSettings.js
View file

@ -279,7 +279,7 @@ module.exports = React.createClass({
}
return (
<div>
<div className='mx_AliasSettings'>
{canonical_alias_section}
<EditableItemList
className={"mx_RoomSettings_localAliases"}

3
src/components/views/settings/RoomProfileSettings.js
View file

@ -34,7 +34,8 @@ export default class RoomProfileSettings extends React.Component {
const client = MatrixClientPeg.get();
const room = client.getRoom(props.roomId);
if (!room) throw new Error("Expected a room for ID: ", props.roomId);
let avatarUrl = room.avatarUrl;
const avatarEvent = room.currentState.getStateEvents("m.room.avatar", "");
let avatarUrl = avatarEvent && avatarEvent.getContent() ? avatarEvent.getContent()["url"] : null;
if (avatarUrl) avatarUrl = client.mxcUrlToHttp(avatarUrl, 96, 96, 'crop', false);
const topicEvent = room.currentState.getStateEvents("m.room.topic", "");
const topic = topicEvent && topicEvent.getContent() ? topicEvent.getContent()['topic'] : null;