OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #3082 from vector-im/luke/feature-optional-custom-login-logo 

Allow a custom login logo to be displayed on login
pull/3105/head
Luke Barnard 2017-01-27 16:34:39 +00:00 committed by GitHub
parent 87f7324065 87db89b67a
commit 78105bb4db
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/components/views/login/VectorLoginHeader.js
View File

@ -23,11 +23,14 @@ module.exports = React.createClass({
statics: { statics: {
replaces: 'LoginHeader', replaces: 'LoginHeader',
}, },
propTypes: {
icon: React.PropTypes.string,
},
render: function() { render: function() {
return ( return (
<div className="mx_Login_logo"> <div className="mx_Login_logo">
<img src="img/logo.png" width="195" height="195" alt="Riot"/> <img src={this.props.icon || "img/logo.png"} alt="Riot"/>
</div> </div>
); );
} }

5
src/skins/vector/css/matrix-react-sdk/structures/login/_Login.scss
View File

@ -42,6 +42,11 @@ limitations under the License.
.mx_Login_logo { .mx_Login_logo {
text-align: center; text-align: center;
height: 195px;
}
.mx_Login_logo img {
height: 100%
} }
.mx_Login_field { .mx_Login_field {