From 5319ee4572aec3d26d0fc4b2d50c1073fa065b15 Mon Sep 17 00:00:00 2001 From: David Baker Date: Thu, 23 Jan 2020 18:14:08 +0000 Subject: [PATCH] Remove riot logo from the security setup screens With a little faff to make the rounded borders consistent again --- res/css/views/auth/_AuthBody.scss | 4 ++++ .../structures/auth/CompleteSecurity.js | 3 +-- src/components/views/auth/AuthBody.js | 18 +++++++++++++++++- 3 files changed, 22 insertions(+), 3 deletions(-) diff --git a/res/css/views/auth/_AuthBody.scss b/res/css/views/auth/_AuthBody.scss index b05629003e..d342de6d75 100644 --- a/res/css/views/auth/_AuthBody.scss +++ b/res/css/views/auth/_AuthBody.scss @@ -95,6 +95,10 @@ limitations under the License. } } +.mx_AuthBody_noHeader { + border-radius: 4px; +} + .mx_AuthBody_editServerDetails { padding-left: 1em; font-size: 12px; diff --git a/src/components/structures/auth/CompleteSecurity.js b/src/components/structures/auth/CompleteSecurity.js index b64f368908..982360e8c1 100644 --- a/src/components/structures/auth/CompleteSecurity.js +++ b/src/components/structures/auth/CompleteSecurity.js @@ -161,8 +161,7 @@ export default class CompleteSecurity extends React.Component { return ( - - +

{icon} {title} diff --git a/src/components/views/auth/AuthBody.js b/src/components/views/auth/AuthBody.js index 9a078efb52..db5c941b20 100644 --- a/src/components/views/auth/AuthBody.js +++ b/src/components/views/auth/AuthBody.js @@ -17,10 +17,26 @@ limitations under the License. 'use strict'; import React from 'react'; +import PropTypes from 'prop-types'; + +import classnames from 'classnames'; export default class AuthBody extends React.PureComponent { + static PropTypes = { + header: PropTypes.bool, + }; + + static defaultProps = { + header: true, + }; + render() { - return
+ const classes = { + 'mx_AuthBody': true, + 'mx_AuthBody_noHeader': !this.props.header, + }; + + return
{ this.props.children }
; }