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

Allow a custom login logo to be displayed on login

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"} alt="Riot"/>
             </div>
         );
     }

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 {