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

Merge pull request #2519 from matrix-org/bwindels/roomdirectory-makeover

Browse source 
Redesign: room directory makeover
This commit is contained in:
Bruno Windels 2019-01-29 19:21:42 +00:00 • committed by GitHub
commit 0cce912cf6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
13 changed files with 159 additions and 126 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/components/views/dialogs/BaseDialog.js
View file

@ -24,7 +24,6 @@ import { MatrixClient } from 'matrix-js-sdk';
import { KeyCode } from '../../../Keyboard';
import AccessibleButton from '../elements/AccessibleButton';
import sdk from '../../../index';
import MatrixClientPeg from '../../../MatrixClientPeg';
/**
@ -106,12 +105,9 @@ export default React.createClass({
},
render: function() {
const TintableSvg = sdk.getComponent("elements.TintableSvg");
let cancelButton;
if (this.props.hasCancel) {
cancelButton = <AccessibleButton onClick={this._onCancelClick} className="mx_Dialog_cancelButton">
<TintableSvg src={require("../../../../res/img/icons-close-button.svg")} width="35" height="35" />
</AccessibleButton>;
}
@ -128,10 +124,15 @@ export default React.createClass({
// AT users can skip its presentation.
aria-describedby={this.props.contentId}
>
{ cancelButton }
<div className={classNames('mx_Dialog_title', this.props.titleClass)} id='mx_BaseDialog_title'>
{ this.props.title }
<div className={classNames('mx_Dialog_header', {
'mx_Dialog_headerWithButton': !!this.props.headerButton,
})}>
<div className={classNames('mx_Dialog_title', this.props.titleClass)} id='mx_BaseDialog_title'>
{ this.props.title }
</div>
{ this.props.headerButton }
</div>
{ cancelButton }
{ this.props.children }
</FocusTrap>
);