Merge pull request #8364 from jryans/auth-bg

Add auth background image and update Riot logo
This commit is contained in:
J. Ryan Stinnett 2019-02-01 14:13:36 -06:00 committed by GitHub
commit 6b359df6c6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
22 changed files with 107 additions and 1002 deletions

View file

@ -20,8 +20,7 @@ limitations under the License.
import React from 'react';
import PropTypes from 'prop-types';
const i = [1, 2, 3, 4, 5][Math.floor(Math.random() * 5)];
const DEFAULT_LOGO_URI = "themes/riot/img/logos/riot-im-logo-" + i + ".svg";
const LOGO_URI = "themes/riot/img/logos/riot-im-logo-black-text.svg";
module.exports = React.createClass({
displayName: 'VectorAuthHeaderLogo',
@ -35,7 +34,7 @@ module.exports = React.createClass({
render: function() {
return (
<div className="mx_AuthHeaderLogo">
<img src={this.props.icon || DEFAULT_LOGO_URI} alt="Riot" />
<img src={LOGO_URI} alt="Riot" />
</div>
);
},

View file

@ -0,0 +1,70 @@
/*
Copyright 2019 New Vector Ltd
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/
'use strict';
const React = require('react');
import sdk from 'matrix-react-sdk/lib/index';
module.exports = React.createClass({
displayName: 'VectorAuthPage',
statics: {
replaces: 'AuthPage',
},
render: function() {
const AuthFooter = sdk.getComponent('auth.AuthFooter');
const pageStyle = {
background: 'center/cover fixed url(../../themes/riot/img/backgrounds/valley.jpg)',
};
const modalStyle = {
position: 'relative',
background: 'initial',
};
const blurStyle = {
position: 'absolute',
top: 0,
right: 0,
bottom: 0,
left: 0,
filter: 'blur(10px)',
background: pageStyle.background,
};
const modalContentStyle = {
display: 'flex',
zIndex: 1,
background: 'rgba(255, 255, 255, 0.59)',
borderRadius: '4px',
};
return (
<div className="mx_AuthPage" style={pageStyle}>
<div className="mx_AuthPage_modal" style={modalStyle}>
<div className="mx_AuthPage_modalBlur" style={blurStyle}></div>
<div className="mx_AuthPage_modalContent" style={modalContentStyle}>
{ this.props.children }
</div>
</div>
<AuthFooter />
</div>
);
},
});