Merge pull request #3916 from matrix-org/dbkr/security_dialog_noheader

Remove riot logo from the security setup screens
This commit is contained in:
David Baker 2020-01-24 09:50:25 +00:00 committed by GitHub
commit 50b05551ba
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 21 additions and 4 deletions

View file

@ -95,6 +95,10 @@ limitations under the License.
} }
} }
.mx_AuthBody_noHeader {
border-radius: 4px;
}
.mx_AuthBody_editServerDetails { .mx_AuthBody_editServerDetails {
padding-left: 1em; padding-left: 1em;
font-size: 12px; font-size: 12px;

View file

@ -77,7 +77,6 @@ export default class CompleteSecurity extends React.Component {
render() { render() {
const AuthPage = sdk.getComponent("auth.AuthPage"); const AuthPage = sdk.getComponent("auth.AuthPage");
const AuthHeader = sdk.getComponent("auth.AuthHeader");
const AuthBody = sdk.getComponent("auth.AuthBody"); const AuthBody = sdk.getComponent("auth.AuthBody");
const AccessibleButton = sdk.getComponent("elements.AccessibleButton"); const AccessibleButton = sdk.getComponent("elements.AccessibleButton");
@ -164,8 +163,7 @@ export default class CompleteSecurity extends React.Component {
return ( return (
<AuthPage> <AuthPage>
<AuthHeader /> <AuthBody header={false}>
<AuthBody>
<h2 className="mx_CompleteSecurity_header"> <h2 className="mx_CompleteSecurity_header">
{icon} {icon}
{title} {title}

View file

@ -17,10 +17,25 @@ limitations under the License.
'use strict'; 'use strict';
import React from 'react'; import React from 'react';
import PropTypes from 'prop-types';
import classnames from 'classnames';
export default class AuthBody extends React.PureComponent { export default class AuthBody extends React.PureComponent {
static PropTypes = {
header: PropTypes.bool,
};
static defaultProps = {
header: true,
};
render() { render() {
return <div className="mx_AuthBody"> const classes = {
'mx_AuthBody': true,
'mx_AuthBody_noHeader': !this.props.header,
};
return <div className={classnames(classes)}>
{ this.props.children } { this.props.children }
</div>; </div>;
} }