Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Allow a custom login logo to be displayed on login #3082

Merged
merged 2 commits into from
Jan 27, 2017
Merged

Allow a custom login logo to be displayed on login #3082

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
02d6a10
Allow a custom login logo to be displayed on login
Jan 27, 2017
87db89b
Replace inline styles for logos with css
Jan 27, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion src/components/views/login/VectorLoginHeader.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,14 @@ module.exports = React.createClass({
statics: {
replaces: 'LoginHeader',
},
propTypes: {
icon: React.PropTypes.string,
},

render: function() {
return (
<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>
);
}
Expand Down
5 changes: 5 additions & 0 deletions src/skins/vector/css/matrix-react-sdk/structures/login/_Login.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,11 @@ limitations under the License.

.mx_Login_logo {
text-align: center;
height: 195px;
}

.mx_Login_logo img {
height: 100%
}

.mx_Login_field {
Expand Down