merge v2-prototype

2018-06-06 12:31:30 +02:00
parent fe437da751 cc39eea999
commit 271fa26890
71 changed files with 1258 additions and 3864 deletions
--- a/packages/website/ts/components/portal/menu.tsx
+++ b/packages/website/ts/components/portal/menu.tsx
@@ -2,8 +2,8 @@ import { Styles } from '@0xproject/react-shared';
 import * as _ from 'lodash';
 import * as React from 'react';
 import { MenuItem } from 'ts/components/ui/menu_item';
+import { colors } from 'ts/style/colors';
 import { WebsitePaths } from 'ts/types';
-import { colors } from 'ts/utils/colors';

 export interface MenuTheme {
    paddingLeft: number;