Merge pull request #63 from matrix-org/jryans/riot-logo

Update Riot logo
This commit is contained in:
J. Ryan Stinnett 2019-10-02 17:51:40 +01:00 committed by GitHub
commit 2c6cc9395a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 21 additions and 3 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.3 KiB

BIN
img/riot.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.8 KiB

BIN
img/riot@2x.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.5 KiB

View file

@ -19,7 +19,11 @@ import React from 'react'
var linkable_clients = [ var linkable_clients = [
{ {
name: "Riot", name: "Riot",
logo: "img/riot-48px.png", logo: {
width: "48px",
src: "img/riot@2x.png",
srcSet: "img/riot.png, img/riot@2x.png 2x",
},
author: "New Vector", author: "New Vector",
homepage: "https://riot.im", homepage: "https://riot.im",
room_url(alias) { return "https://riot.im/app/#/room/" + alias }, room_url(alias) { return "https://riot.im/app/#/room/" + alias },
@ -295,10 +299,17 @@ export default React.createClass({
} }
if (!link) return null; if (!link) return null;
let logo;
if (typeof client.logo === "string") {
logo = <img src={client.logo} />;
} else {
logo = <img {...client.logo} />;
}
return ( return (
<div key={ client.name } className="mxt_HomePage_link"> <div key={ client.name } className="mxt_HomePage_link">
<div className="mxt_HomePage_link_logo"> <div className="mxt_HomePage_link_logo">
<a href={ link }><img src={ client.logo }/></a> <a href={ link }>{ logo }</a>
</div> </div>
<div className="mxt_HomePage_link_name"> <div className="mxt_HomePage_link_name">
<a href={ link }>{ client.name }</a> <a href={ link }>{ client.name }</a>
@ -337,10 +348,17 @@ export default React.createClass({
} }
if (!instructions) return null; if (!instructions) return null;
let logo;
if (typeof client.logo === "string") {
logo = <img src={client.logo} />;
} else {
logo = <img {...client.logo} />;
}
return ( return (
<div key={ client.name } className="mxt_HomePage_link"> <div key={ client.name } className="mxt_HomePage_link">
<div className="mxt_HomePage_link_logo"> <div className="mxt_HomePage_link_logo">
<a href={ client.homepage }><img src={ client.logo }/></a> <a href={ client.homepage }>{ logo }</a>
</div> </div>
<div className="mxt_HomePage_link_name"> <div className="mxt_HomePage_link_name">
<a href={ client.homepage }>{ client.name }</a> <a href={ client.homepage }>{ client.name }</a>