aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--packages/react-shared/src/utils/colors.ts2
-rw-r--r--packages/website/ts/components/forms/subscribe_form.tsx8
-rw-r--r--packages/website/ts/components/ui/text.tsx2
-rw-r--r--packages/website/ts/pages/landing/landing.tsx2
-rw-r--r--yarn.lock2
5 files changed, 8 insertions, 8 deletions
diff --git a/packages/react-shared/src/utils/colors.ts b/packages/react-shared/src/utils/colors.ts
index 71d92c290..92f45c2e7 100644
--- a/packages/react-shared/src/utils/colors.ts
+++ b/packages/react-shared/src/utils/colors.ts
@@ -22,7 +22,7 @@ const baseColors = {
heroGrey: '#404040',
projectsGrey: '#343333',
darkestGrey: '#272727',
- dharmaDarkGrey: '#252525',
+ darkButtonGrey: '#252525',
lightBlue: '#60A4F4',
lightBlueA700: '#0091EA',
linkBlue: '#1D5CDE',
diff --git a/packages/website/ts/components/forms/subscribe_form.tsx b/packages/website/ts/components/forms/subscribe_form.tsx
index 99686efce..b83a9c346 100644
--- a/packages/website/ts/components/forms/subscribe_form.tsx
+++ b/packages/website/ts/components/forms/subscribe_form.tsx
@@ -1,11 +1,11 @@
import { colors } from '@0xproject/react-shared';
import * as React from 'react';
+import { logUtils } from '@0xproject/utils';
import { Button } from 'ts/components/ui/button';
+import { Container } from 'ts/components/ui/container';
import { Input } from 'ts/components/ui/input';
import { Text } from 'ts/components/ui/text';
-import { logUtils } from '@0xproject/utils';
-import { Container } from 'ts/components/ui/container';
import { styled } from 'ts/style/theme';
import { backendClient } from 'ts/utils/backend_client';
@@ -47,7 +47,7 @@ export class SubscribeForm extends React.Component<SubscribeFormProps, Subscribe
value={this.state.emailText}
fontColor={colors.white}
fontSize={formFontSize}
- backgroundColor="#343333"
+ backgroundColor={colors.projectsGrey}
width="275px"
onChange={this._handleEmailInputChange.bind(this)}
/>
@@ -55,7 +55,7 @@ export class SubscribeForm extends React.Component<SubscribeFormProps, Subscribe
<Container marginLeft="15px" marginTop="15px">
<Button
type="submit"
- backgroundColor="#252525"
+ backgroundColor={colors.darkButtonGrey}
fontColor={colors.white}
fontSize={formFontSize}
>
diff --git a/packages/website/ts/components/ui/text.tsx b/packages/website/ts/components/ui/text.tsx
index 259365618..d3e205d12 100644
--- a/packages/website/ts/components/ui/text.tsx
+++ b/packages/website/ts/components/ui/text.tsx
@@ -52,5 +52,5 @@ export const TranslatedText: React.StatelessComponent<TranslatedTextProps> = ({
translate,
children,
deco,
- ...textProps
+ ...textProps,
}) => <Text {...textProps}>{translate.get(children, deco)}</Text>;
diff --git a/packages/website/ts/pages/landing/landing.tsx b/packages/website/ts/pages/landing/landing.tsx
index 0911bb2cf..1a1772a23 100644
--- a/packages/website/ts/pages/landing/landing.tsx
+++ b/packages/website/ts/pages/landing/landing.tsx
@@ -1,12 +1,12 @@
import { colors } from '@0xproject/react-shared';
import * as _ from 'lodash';
import * as React from 'react';
-import { CTA } from 'ts/components/ui/button';
import DocumentTitle = require('react-document-title');
import { Link } from 'react-router-dom';
import { Footer } from 'ts/components/footer';
import { SubscribeForm } from 'ts/components/forms/subscribe_form';
import { TopBar } from 'ts/components/top_bar/top_bar';
+import { CTA } from 'ts/components/ui/button';
import { Dispatcher } from 'ts/redux/dispatcher';
import { Deco, Key, Language, ScreenWidths, WebsitePaths } from 'ts/types';
import { constants } from 'ts/utils/constants';
diff --git a/yarn.lock b/yarn.lock
index 668b44760..f2737db52 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4079,7 +4079,7 @@ ethereumjs-blockstream@^2.0.6:
source-map-support "0.4.14"
uuid "3.0.1"
-ethereumjs-tx@^1.0.0, ethereumjs-tx@^1.1.1, ethereumjs-tx@^1.2.0, ethereumjs-tx@^1.2.2, ethereumjs-tx@^1.3.0, ethereumjs-tx@^1.3.3:
+ethereumjs-tx@0xProject/ethereumjs-tx#fake-tx-include-signature-by-default, ethereumjs-tx@^1.0.0, ethereumjs-tx@^1.1.1, ethereumjs-tx@^1.2.0, ethereumjs-tx@^1.2.2, ethereumjs-tx@^1.3.0, ethereumjs-tx@^1.3.3:
version "1.3.4"
resolved "https://codeload.github.com/0xProject/ethereumjs-tx/tar.gz/5f0a610849de09f922f8ccee5af1aae4bec36e51"
dependencies: