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.

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

Conversation

@lukebarnard1
Copy link
Contributor

lukebarnard1 commented Jan 27, 2017

This is to allow team logos to be shown when a user registers with a team email.

This is to allow team logos to be shown when a user registers with a team email.
@lukebarnard1 lukebarnard1 requested a review from dbkr Jan 27, 2017

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"} width="195" height="195" alt="Riot"/>

This comment has been minimized.

Copy link
@dbkr

dbkr Jan 27, 2017

Member

Will icons always be square? May want to only set one of these dimensions and give it a bounding box if necessary to stop things around it jumping about after the image loads.

This comment has been minimized.

Copy link
@lukebarnard1

lukebarnard1 Jan 27, 2017

Author Contributor

Oh, two good points.

This comment has been minimized.

Copy link
@dbkr

dbkr Jan 27, 2017

Member

Come to think of it, I'd have thought you'd still want the riot logo in any case, and the team logo would be in addition?

This comment has been minimized.

Copy link
@lukebarnard1

lukebarnard1 Jan 27, 2017

Author Contributor

The current design is to replace it entirely

Also, give .mx_Login_logo a height so that if the image has not loaded yet, it will not change height (thanks @dbkr)
@dbkr
dbkr approved these changes Jan 27, 2017
@lukebarnard1 lukebarnard1 merged commit 78105bb into develop Jan 27, 2017
2 checks passed
2 checks passed
continuous-integration/travis-ci/pr The Travis CI build passed
Details
continuous-integration/travis-ci/push The Travis CI build passed
Details
@lukebarnard1 lukebarnard1 deleted the luke/feature-optional-custom-login-logo branch Jan 27, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
2 participants
You can’t perform that action at this time.