aboutsummaryrefslogtreecommitdiffstats
path: root/packages/website/ts/pages
diff options
context:
space:
mode:
authorF. Eugene Aumson <feuGeneA@users.noreply.github.com>2018-09-26 21:19:02 +0800
committerF. Eugene Aumson <feuGeneA@users.noreply.github.com>2018-09-26 21:19:02 +0800
commit75826fd5594ab9c6efaa7882203f73686db7d469 (patch)
tree1d61dbdba89a08e288a537b7a77a692a0ec1099a /packages/website/ts/pages
parent0ce6f03ed50820022d7534ae257306bbf2f17fc1 (diff)
parent13aa98f0f3431e4ea4db07794a06304c237e8d45 (diff)
downloaddexon-sol-tools-75826fd5594ab9c6efaa7882203f73686db7d469.tar
dexon-sol-tools-75826fd5594ab9c6efaa7882203f73686db7d469.tar.gz
dexon-sol-tools-75826fd5594ab9c6efaa7882203f73686db7d469.tar.bz2
dexon-sol-tools-75826fd5594ab9c6efaa7882203f73686db7d469.tar.lz
dexon-sol-tools-75826fd5594ab9c6efaa7882203f73686db7d469.tar.xz
dexon-sol-tools-75826fd5594ab9c6efaa7882203f73686db7d469.tar.zst
dexon-sol-tools-75826fd5594ab9c6efaa7882203f73686db7d469.zip
Merge remote-tracking branch 'upstream/development' into sol-doc
Diffstat (limited to 'packages/website/ts/pages')
-rw-r--r--packages/website/ts/pages/about/about.tsx18
-rw-r--r--packages/website/ts/pages/landing/landing.tsx4
2 files changed, 20 insertions, 2 deletions
diff --git a/packages/website/ts/pages/about/about.tsx b/packages/website/ts/pages/about/about.tsx
index 42237bec3..75295349d 100644
--- a/packages/website/ts/pages/about/about.tsx
+++ b/packages/website/ts/pages/about/about.tsx
@@ -216,6 +216,23 @@ const teamRow7: ProfileInfo[] = [
},
];
+const teamRow8: ProfileInfo[] = [
+ {
+ name: 'Weijie Wu',
+ title: 'Research Fellow',
+ description: `Researching decentralized governance. Previously Researcher at Huawei and Assistant Professor at Shanghai Jiao Tong University. PhD in Computer Science at The Chinese University of Hong Kong.`,
+ image: 'images/team/weijie.png',
+ linkedIn: 'https://www.linkedin.com/in/weijiewu/',
+ },
+ {
+ name: 'Rahul Singireddy',
+ title: 'Relayer Success Manager',
+ description: `Previously community at Zeppelin, growth at Dharma, and cryptocurrency contributor at Forbes. Symbolic Systems at Stanford.`,
+ image: 'images/team/rahul.png',
+ linkedIn: 'https://www.linkedin.com/in/rahul-singireddy-3037908a/',
+ },
+];
+
const advisors1: ProfileInfo[] = [
{
name: 'Fred Ehrsam',
@@ -323,6 +340,7 @@ export class About extends React.Component<AboutProps, AboutState> {
<div className="clearfix">{this._renderProfiles(teamRow5)}</div>
<div className="clearfix">{this._renderProfiles(teamRow6)}</div>
<div className="clearfix">{this._renderProfiles(teamRow7)}</div>
+ <div className="clearfix">{this._renderProfiles(teamRow8)}</div>
</div>
<div className="pt3 pb2">
<div
diff --git a/packages/website/ts/pages/landing/landing.tsx b/packages/website/ts/pages/landing/landing.tsx
index 211be7bf2..388e83d51 100644
--- a/packages/website/ts/pages/landing/landing.tsx
+++ b/packages/website/ts/pages/landing/landing.tsx
@@ -37,8 +37,8 @@ interface Project {
}
const THROTTLE_TIMEOUT = 100;
-const WHATS_NEW_TITLE = '18 ideas for 0x relayers in 2018';
-const WHATS_NEW_URL = 'https://blog.0xproject.com/18-ideas-for-0x-relayers-in-2018-80a1498b955f';
+const WHATS_NEW_TITLE = '0x Protocol v2 is Live!';
+const WHATS_NEW_URL = 'https://blog.0xproject.com/0x-protocol-v2-0-is-live-183aac180149';
const TITLE_STYLE: React.CSSProperties = {
fontFamily: 'Roboto Mono',
color: colors.grey,