Allow a custom login logo to be displayed on login #3082
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This is to allow team logos to be shown when a user registers with a team email.
dbkr
reviewed
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"/> |
There was a problem hiding this comment.
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.
There was a problem hiding this comment.
Oh, two good points.
There was a problem hiding this comment.
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?
There was a problem hiding this comment.
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
approved these changes
Jan 27, 2017
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This is to allow team logos to be shown when a user registers with a team email.