From 02d6a10f67818be7919a4237fb48f0d1d771a269 Mon Sep 17 00:00:00 2001
From: Luke Barnard <lukeb@openmarket.com>
Date: Fri, 27 Jan 2017 16:08:14 +0000
Subject: [PATCH 1/2] Allow a custom login logo to be displayed on login
This is to allow team logos to be shown when a user registers with a team email.
---
src/components/views/login/VectorLoginHeader.js | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/src/components/views/login/VectorLoginHeader.js b/src/components/views/login/VectorLoginHeader.js
index 32867230..b08c4fa6 100644
--- a/src/components/views/login/VectorLoginHeader.js
+++ b/src/components/views/login/VectorLoginHeader.js
@@ -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"} width="195" height="195" alt="Riot"/>
</div>
);
}
From 87db89b67a21a77c2535dc971022d77645cd4581 Mon Sep 17 00:00:00 2001
From: Luke Barnard <lukeb@openmarket.com>
Date: Fri, 27 Jan 2017 16:30:44 +0000
Subject: [PATCH 2/2] Replace inline styles for logos with css
Also, give .mx_Login_logo a height so that if the image has not loaded yet, it will not change height (thanks @dbkr)
---
src/components/views/login/VectorLoginHeader.js | 2 +-
.../vector/css/matrix-react-sdk/structures/login/_Login.scss | 5 +++++
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/src/components/views/login/VectorLoginHeader.js b/src/components/views/login/VectorLoginHeader.js
index b08c4fa6..daa2b09c 100644
--- a/src/components/views/login/VectorLoginHeader.js
+++ b/src/components/views/login/VectorLoginHeader.js
@@ -30,7 +30,7 @@ module.exports = React.createClass({
render: function() {
return (
<div className="mx_Login_logo">
- <img src={this.props.icon || "img/logo.png"} width="195" height="195" alt="Riot"/>
+ <img src={this.props.icon || "img/logo.png"} alt="Riot"/>
</div>
);
}
diff --git a/src/skins/vector/css/matrix-react-sdk/structures/login/_Login.scss b/src/skins/vector/css/matrix-react-sdk/structures/login/_Login.scss
index 30231b43..ca861c07 100644
--- a/src/skins/vector/css/matrix-react-sdk/structures/login/_Login.scss
+++ b/src/skins/vector/css/matrix-react-sdk/structures/login/_Login.scss
@@ -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 {