diff options
author | Fabio Berger <me@fabioberger.com> | 2018-03-20 19:52:22 +0800 |
---|---|---|
committer | Fabio Berger <me@fabioberger.com> | 2018-03-20 19:52:22 +0800 |
commit | 2f7c19e80d31cbcc09c6e87841682e8f35f0ecd5 (patch) | |
tree | 60d846e22cf80416f0dd43ead8dd494c5735152f /packages/website/ts/pages | |
parent | 5468358f2142549c68ffae0085ce7d31ea271ea4 (diff) | |
parent | 7d9c357409c25996f9c448dffd69007f69b9d8d6 (diff) | |
download | dexon-sol-tools-2f7c19e80d31cbcc09c6e87841682e8f35f0ecd5.tar dexon-sol-tools-2f7c19e80d31cbcc09c6e87841682e8f35f0ecd5.tar.gz dexon-sol-tools-2f7c19e80d31cbcc09c6e87841682e8f35f0ecd5.tar.bz2 dexon-sol-tools-2f7c19e80d31cbcc09c6e87841682e8f35f0ecd5.tar.lz dexon-sol-tools-2f7c19e80d31cbcc09c6e87841682e8f35f0ecd5.tar.xz dexon-sol-tools-2f7c19e80d31cbcc09c6e87841682e8f35f0ecd5.tar.zst dexon-sol-tools-2f7c19e80d31cbcc09c6e87841682e8f35f0ecd5.zip |
Merge branch 'development' into addExtraDocs
* development: (29 commits)
Set Lodash dep to an exact version since newer versions introduced breaking changes
Update Kovan Ethertoken Address
Update deployer version since manual re-publish
Add new entry into CHANGELOG
Fix bad merge
Update yarn.lock
Change title
Add Blake and Zach to About page
Re-size Jacob and Tom's images
Manually publish 0x.js back to a working state
Publish
Publish
Fix 0x.js assets
Remove assets from connect and _bundles from packages that don't generate the folder
Publish
Fix packages that aren't working as expected
Make new packages default to public on publish
Add new public packages to top-level README
Update top-level package.json
Fix incorrect new versions
...
# Conflicts:
# packages/0x.js/package.json
# packages/connect/package.json
# packages/json-schemas/package.json
# packages/sol-cov/package.json
Diffstat (limited to 'packages/website/ts/pages')
-rw-r--r-- | packages/website/ts/pages/about/about.tsx | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/packages/website/ts/pages/about/about.tsx b/packages/website/ts/pages/about/about.tsx index 7f1e0bf80..293580913 100644 --- a/packages/website/ts/pages/about/about.tsx +++ b/packages/website/ts/pages/about/about.tsx @@ -108,6 +108,27 @@ const teamRow3: ProfileInfo[] = [ }, ]; +const teamRow4: ProfileInfo[] = [ + { + name: 'Blake Henderson', + title: 'Operations Associate', + description: `Operations and Analytics. Previously analytics at LinkedIn. Economics at UC San Diego. `, + image: '/images/team/blake.jpg', + linkedIn: 'https://www.linkedin.com/in/blakerhenderson/', + github: '', + medium: '', + }, + { + name: 'Zack Skelly', + title: 'Lead Recruiter', + description: `Talent. Previously first recruiter at Heap, recruiting at Dropbox and Google. English Rhetoric and Composition at Pepperdine.`, + image: '/images/team/zach.png', + linkedIn: 'https://www.linkedin.com/in/zackaryskelly/', + github: '', + medium: '', + }, +]; + const advisors: ProfileInfo[] = [ { name: 'Fred Ehrsam', @@ -200,6 +221,7 @@ export class About extends React.Component<AboutProps, AboutState> { <div className="clearfix pb3">{this._renderProfiles(teamRow1)}</div> <div className="clearfix">{this._renderProfiles(teamRow2)}</div> <div className="clearfix">{this._renderProfiles(teamRow3)}</div> + <div className="clearfix">{this._renderProfiles(teamRow4)}</div> </div> <div className="pt3 pb2"> <div |