diff options
| author | Fabio Berger <me@fabioberger.com> | 2018-08-22 18:41:42 +0800 |
|---|---|---|
| committer | Fabio Berger <me@fabioberger.com> | 2018-08-22 18:41:42 +0800 |
| commit | 0248add542ac801bcb021fa7b13c182baec5612e (patch) | |
| tree | 1d04404632ee381621b384f1e82ade97c06c9b92 /packages/website/ts | |
| parent | c12f0d04bb2f0d5ad73943d02a592a110423a423 (diff) | |
| parent | 80e52464a6fdf9576776214f77e46d441b959b06 (diff) | |
| download | dexon-sol-tools-0248add542ac801bcb021fa7b13c182baec5612e.tar dexon-sol-tools-0248add542ac801bcb021fa7b13c182baec5612e.tar.gz dexon-sol-tools-0248add542ac801bcb021fa7b13c182baec5612e.tar.bz2 dexon-sol-tools-0248add542ac801bcb021fa7b13c182baec5612e.tar.lz dexon-sol-tools-0248add542ac801bcb021fa7b13c182baec5612e.tar.xz dexon-sol-tools-0248add542ac801bcb021fa7b13c182baec5612e.tar.zst dexon-sol-tools-0248add542ac801bcb021fa7b13c182baec5612e.zip | |
Merge development branch
Diffstat (limited to 'packages/website/ts')
| -rw-r--r-- | packages/website/ts/components/onboarding/intro_onboarding_step.tsx | 4 | ||||
| -rw-r--r-- | packages/website/ts/pages/about/about.tsx | 9 |
2 files changed, 11 insertions, 2 deletions
diff --git a/packages/website/ts/components/onboarding/intro_onboarding_step.tsx b/packages/website/ts/components/onboarding/intro_onboarding_step.tsx index 3a27b6854..f9ced7315 100644 --- a/packages/website/ts/components/onboarding/intro_onboarding_step.tsx +++ b/packages/website/ts/components/onboarding/intro_onboarding_step.tsx @@ -20,7 +20,9 @@ export const IntroOnboardingStep: React.StatelessComponent<IntroOnboardingStepPr <Text> Wrap ETH </Text> </div> <div className="flex flex-column items-center"> - <Image src="/images/fake_toggle.svg" height="50px" width="50px" /> + <Container marginBottom="9px"> + <Image src="/images/lock_icon.svg" height="35px" width="35x" /> + </Container> <Text> Unlock tokens </Text> </div> </Container> diff --git a/packages/website/ts/pages/about/about.tsx b/packages/website/ts/pages/about/about.tsx index aef4d0df9..519e4be5e 100644 --- a/packages/website/ts/pages/about/about.tsx +++ b/packages/website/ts/pages/about/about.tsx @@ -82,7 +82,7 @@ const teamRow3: ProfileInfo[] = [ name: 'Brandon Millman', title: 'Senior Engineer', description: `Full-stack engineer. Previously senior software engineer at \ - Twitter. Electrical and Computer Engineering at Duke.`, + Twitter. Computer Science and Electrical Engineering at Duke.`, image: '/images/team/brandon.png', linkedIn: 'https://www.linkedin.com/in/brandon-millman-b093a022/', github: 'https://github.com/BMillman19', @@ -199,6 +199,13 @@ const teamRow7: ProfileInfo[] = [ image: 'images/team/clay.png', linkedIn: 'https://www.linkedin.com/in/robbinsclay/', }, + { + name: 'Matt Taylor', + title: 'Marketing Lead', + description: `Growth & Marketing. Previously marketing at Abra and Square. Economics and Philosophy at Claremont McKenna College.`, + image: 'images/team/matt.jpg', + linkedIn: 'https://www.linkedin.com/in/mattytay/', + }, ]; const advisors: ProfileInfo[] = [ |