Merge remote-tracking branch 'origin/develop' into develop
This commit is contained in:
commit
e2b7ff3675
|
@ -45,13 +45,9 @@ class HeaderButton extends React.Component {
|
|||
const TintableSvg = sdk.getComponent("elements.TintableSvg");
|
||||
const AccessibleButton = sdk.getComponent("elements.AccessibleButton");
|
||||
|
||||
return <AccessibleButton
|
||||
className="mx_RightPanel_headerButton"
|
||||
key={this.props.key}
|
||||
onClick={ this.onClick }
|
||||
>
|
||||
return <AccessibleButton className="mx_RightPanel_headerButton" onClick={this.onClick} >
|
||||
<div className="mx_RightPanel_headerButton_badge">
|
||||
{ this.props.badge ? this.props.badge : <span> </span>}
|
||||
{ this.props.badge ? this.props.badge : <span> </span> }
|
||||
</div>
|
||||
<TintableSvg src={this.props.iconSrc} width="25" height="25"/>
|
||||
{ this.props.isHighlighted ? <div className="mx_RightPanel_headerButton_highlight"></div> : <div/> }
|
||||
|
|
Loading…
Reference in New Issue