aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFabio Berger <me@fabioberger.com>2018-10-01 20:16:00 +0800
committerFabio Berger <me@fabioberger.com>2018-10-01 20:16:00 +0800
commit8651b7bc257df4563b50994202e304e39a9e1165 (patch)
treecb3e37000f1a3d4e1e1303db13d22fd21fed0801
parent9c6bb4245d2ab81104ee78e09619751f2d54ff9c (diff)
parente7ab9938ce5bde17600130584fc75bc8a45f6dc5 (diff)
downloaddexon-sol-tools-8651b7bc257df4563b50994202e304e39a9e1165.tar
dexon-sol-tools-8651b7bc257df4563b50994202e304e39a9e1165.tar.gz
dexon-sol-tools-8651b7bc257df4563b50994202e304e39a9e1165.tar.bz2
dexon-sol-tools-8651b7bc257df4563b50994202e304e39a9e1165.tar.lz
dexon-sol-tools-8651b7bc257df4563b50994202e304e39a9e1165.tar.xz
dexon-sol-tools-8651b7bc257df4563b50994202e304e39a9e1165.tar.zst
dexon-sol-tools-8651b7bc257df4563b50994202e304e39a9e1165.zip
fix merge
-rw-r--r--packages/website/ts/components/dropdowns/developers_drop_down.tsx18
-rw-r--r--packages/website/ts/types.ts1
2 files changed, 12 insertions, 7 deletions
diff --git a/packages/website/ts/components/dropdowns/developers_drop_down.tsx b/packages/website/ts/components/dropdowns/developers_drop_down.tsx
index f03bc6623..7d310df72 100644
--- a/packages/website/ts/components/dropdowns/developers_drop_down.tsx
+++ b/packages/website/ts/components/dropdowns/developers_drop_down.tsx
@@ -2,9 +2,11 @@ import { colors } from '@0xproject/react-shared';
import { ObjectMap } from '@0xproject/types';
import * as _ from 'lodash';
import * as React from 'react';
+import { Container } from 'ts/components/ui/container';
import { DropDown } from 'ts/components/ui/drop_down';
import { Link } from 'ts/components/ui/link';
-import { Deco, Key, WebsitePaths } from 'ts/types';
+import { Text } from 'ts/components/ui/text';
+import { Deco, Key, ObjectMap, WebsitePaths } from 'ts/types';
import { constants } from 'ts/utils/constants';
import { Translate } from 'ts/utils/translate';
@@ -66,9 +68,11 @@ interface DevelopersDropDownState {}
export class DevelopersDropDown extends React.Component<DevelopersDropDownProps, DevelopersDropDownState> {
public render(): React.ReactNode {
const activeNode = (
- <div className="flex relative" style={{ color: this.props.menuIconStyle.color }}>
- <div style={{ paddingRight: 10 }}>{this.props.translate.get(Key.Developers, Deco.Cap)}</div>
- </div>
+ <Container className="flex relative" paddingRight="10">
+ <Text fontColor={this.props.menuIconStyle.color}>
+ {this.props.translate.get(Key.Developers, Deco.Cap)}
+ </Text>
+ </Container>
);
return (
<DropDown
@@ -84,13 +88,13 @@ export class DevelopersDropDown extends React.Component<DevelopersDropDownProps,
private _renderDropdownMenu(): React.ReactNode {
const dropdownMenu = (
<div>
- <div style={{ padding: '1.75rem' }}>
+ <Container padding="1.75rem">
{this._renderTitle('Getting started')}
<div className="flex">
<div className="pr4 mr2">{this._renderLinkSection(gettingStartedKeyToLinkInfo1)}</div>
<div>{this._renderLinkSection(gettingStartedKeyToLinkInfo2)}</div>
</div>
- </div>
+ </Container>
<div
style={{
width: '100%',
@@ -110,7 +114,7 @@ export class DevelopersDropDown extends React.Component<DevelopersDropDownProps,
</div>
<div
style={{
- padding: '1.125rem',
+ padding: '0.8rem',
textAlign: 'center',
backgroundColor: colors.lightBgGrey,
borderBottomLeftRadius: 4,
diff --git a/packages/website/ts/types.ts b/packages/website/ts/types.ts
index eeb0efaea..31a33bb76 100644
--- a/packages/website/ts/types.ts
+++ b/packages/website/ts/types.ts
@@ -457,6 +457,7 @@ export enum Key {
Home = 'HOME',
RocketChat = 'ROCKETCHAT',
TradeCallToAction = 'TRADE_CALL_TO_ACTION',
+ OurMissionAndValues = 'OUR_MISSION_AND_VALUES',
BuildARelayer = 'BUILD_A_RELAYER',
BuildARelayerDescription = 'BUILD_A_RELAYER_DESCRIPTION',
DevelopOnEthereum = 'DEVELOP_ON_ETHEREUM',