crowetic/protocol
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'feature/website/landing-subscribe-button' into feature/website/landing-subscribe-button-2

Browse Source
This commit is contained in:
fragosti
2018-06-01 17:28:04 -07:00
parent 62e60e2ba6 073a96cf63
commit 95086a75e6
30 changed files with 424 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/website/ts/components/top_bar/top_bar.tsx
View File

@@ -16,9 +16,9 @@ import { TopBarMenuItem } from 'ts/components/top_bar/top_bar_menu_item';
import { DropDown } from 'ts/components/ui/drop_down';
import { Identicon } from 'ts/components/ui/identicon';
import { Dispatcher } from 'ts/redux/dispatcher';
import { zIndex } from 'ts/style/z_index';
import { Deco, Key, ProviderType, WebsiteLegacyPaths, WebsitePaths } from 'ts/types';
import { constants } from 'ts/utils/constants';
import { zIndex } from 'ts/utils/style';
import { Translate } from 'ts/utils/translate';
import { utils } from 'ts/utils/utils';