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

Menu colour now changeable, and leave room item hooked up

Browse source
This commit is contained in:
wmwragg 2016-08-10 16:34:49 +01:00
parent 667264420c
commit e2d3631e7c
3 changed files with 37 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/components/views/rooms/RoomHeader.js
View file

@ -271,13 +271,13 @@ module.exports = React.createClass({
</div>;
}
var leave_button;
if (this.props.onLeaveClick) {
leave_button =
<div className="mx_RoomHeader_button" onClick={this.props.onLeaveClick} title="Leave room">
<TintableSvg src="img/leave.svg" width="26" height="20"/>
</div>;
}
// var leave_button;
// if (this.props.onLeaveClick) {
// leave_button =
// <div className="mx_RoomHeader_button" onClick={this.props.onLeaveClick} title="Leave room">
// <TintableSvg src="img/leave.svg" width="26" height="20"/>
// </div>;
// }
var forget_button;
if (this.props.onForgetClick) {
@ -298,7 +298,6 @@ module.exports = React.createClass({
<div className="mx_RoomHeader_rightRow">
{ settings_button }
{ forget_button }
{ leave_button }
<div className="mx_RoomHeader_button" onClick={this.props.onSearchClick} title="Search">
<TintableSvg src="img/icons-search.svg" width="35" height="35"/>
</div>

3
src/components/views/rooms/RoomTile.js
View file

@ -159,6 +159,7 @@ module.exports = React.createClass({
var self = this;
ContextualMenu.createMenu(RoomTagMenu, {
chevronOffset: 10,
menuColour: "#FFFFFF",
left: x,
top: y,
room: this.props.room,
@ -265,7 +266,7 @@ module.exports = React.createClass({
<div className={avatarClasses}>
<div className="mx_RoomTile_avatar_menu" onClick={this.onAvatarClicked}>
<div className={avatarContainerClasses}>
<RoomAvatar room={this.props.room} width={24} height={24} />
<RoomAvatar room={this.props.room} width={25} height={25} />
</div>
</div>
</div>