diff options
| author | Fabio Berger <me@fabioberger.com> | 2018-02-26 10:32:12 +0800 |
|---|---|---|
| committer | Fabio Berger <me@fabioberger.com> | 2018-02-26 10:32:12 +0800 |
| commit | fffaafe4c996ac0c458dd6cb9e3598b1d93b7aa4 (patch) | |
| tree | 21f9398ba2975bda4706fb8f54c0c717b88ecfd4 /packages/website | |
| parent | 66b36f6d8f7c0f0487e53badb035ac50e1ec5669 (diff) | |
| parent | 709fa9e02ec21cee9fc145b4a578742c8dd190aa (diff) | |
| download | dexon-sol-tools-fffaafe4c996ac0c458dd6cb9e3598b1d93b7aa4.tar dexon-sol-tools-fffaafe4c996ac0c458dd6cb9e3598b1d93b7aa4.tar.gz dexon-sol-tools-fffaafe4c996ac0c458dd6cb9e3598b1d93b7aa4.tar.bz2 dexon-sol-tools-fffaafe4c996ac0c458dd6cb9e3598b1d93b7aa4.tar.lz dexon-sol-tools-fffaafe4c996ac0c458dd6cb9e3598b1d93b7aa4.tar.xz dexon-sol-tools-fffaafe4c996ac0c458dd6cb9e3598b1d93b7aa4.tar.zst dexon-sol-tools-fffaafe4c996ac0c458dd6cb9e3598b1d93b7aa4.zip | |
Merge branch 'development' into moveOutDocGenerator
* development: (36 commits)
Fix english translations
Fix footer on mobile
re-add google analytics code
Fix Russian translation
Move all dependencies on @0xproject/types out of devDependencies
Slight improvement to footer
Fix a few Korean translations
Address feedback
Use source tree hash instead of compile flag
Fix race condition
Update CHANGELOG
Delete artifacts directory
Add generated contract artifacts to gitignore
Check dependencies when determining if should be recompiled
Update CHANGELOG
Remove unused CHANGELOG entry
Remove unused import
Change assert.doesConformToShema interface
Remove a type assertion
Publish
...
Diffstat (limited to 'packages/website')
| -rw-r--r-- | packages/website/package.json | 10 | ||||
| -rw-r--r-- | packages/website/public/index.html | 12 | ||||
| -rw-r--r-- | packages/website/translations/english.json | 6 | ||||
| -rw-r--r-- | packages/website/translations/korean.json | 6 | ||||
| -rw-r--r-- | packages/website/translations/russian.json | 2 | ||||
| -rw-r--r-- | packages/website/ts/components/footer.tsx | 8 | ||||
| -rw-r--r-- | packages/website/ts/containers/connect_documentation.tsx | 1 |
7 files changed, 28 insertions, 17 deletions
diff --git a/packages/website/package.json b/packages/website/package.json index 06cdf2731..1d313390a 100644 --- a/packages/website/package.json +++ b/packages/website/package.json @@ -1,6 +1,6 @@ { "name": "@0xproject/website", - "version": "0.0.15", + "version": "0.0.16", "private": true, "description": "Website and 0x portal dapp", "scripts": { @@ -18,9 +18,9 @@ "author": "Fabio Berger", "license": "Apache-2.0", "dependencies": { - "0x.js": "^0.32.3", - "@0xproject/subproviders": "^0.4.2", - "@0xproject/utils": "^0.3.3", + "0x.js": "^0.32.4", + "@0xproject/subproviders": "^0.5.0", + "@0xproject/utils": "^0.3.4", "accounting": "^0.4.1", "basscss": "^8.0.3", "blockies": "^0.0.2", @@ -98,7 +98,7 @@ "tslint": "5.8.0", "tslint-config-0xproject": "^0.0.2", "typescript": "2.7.1", - "web3-typescript-typings": "^0.9.10", + "web3-typescript-typings": "^0.9.11", "webpack": "^3.1.0", "webpack-dev-middleware": "^1.10.0", "webpack-dev-server": "^2.5.0" diff --git a/packages/website/public/index.html b/packages/website/public/index.html index 75ca9a4ed..c28e4abf4 100644 --- a/packages/website/public/index.html +++ b/packages/website/public/index.html @@ -23,6 +23,18 @@ </head> <body style="margin: 0px; min-width: 355px;"> + <!-- Global site tag (gtag.js) - Google Analytics --> + <script async src="https://www.googletagmanager.com/gtag/js?id=UA-98720122-1"></script> + <script> + window.dataLayer = window.dataLayer || []; +function gtag() { + dataLayer.push(arguments); +} +gtag('js', new Date()); + +gtag('config', 'UA-98720122-1'); +</script> + <!-- End Google Analytics --> <!-- Facebook SDK --> <div id="fb-root"></div> <script> diff --git a/packages/website/translations/english.json b/packages/website/translations/english.json index 8aebe1848..9a1c9b2c8 100644 --- a/packages/website/translations/english.json +++ b/packages/website/translations/english.json @@ -67,7 +67,7 @@ "STANDARD_RELAYER_API": "standard relayer API", "PORTAL_DAPP": "portal dApp", "WEBSITE": "website", - "DEVELOPERS": "home", - "HOME": "rocket.chat", - "ROCKETCHAT": "developers" + "DEVELOPERS": "developers", + "HOME": "home", + "ROCKETCHAT": "rocket.chat" } diff --git a/packages/website/translations/korean.json b/packages/website/translations/korean.json index 9a9ae715c..b9be664e2 100644 --- a/packages/website/translations/korean.json +++ b/packages/website/translations/korean.json @@ -66,7 +66,7 @@ "STANDARD_RELAYER_API": "Standard Relayer API", "PORTAL_DAPP": "포털 dApp", "WEBSITE": "Website", - "DEVELOPERS": "홈", - "HOME": "Rocket.chat", - "ROCKETCHAT": "개발자" + "HOME": "홈", + "ROCKETCHAT": "Rocket.chat", + "DEVELOPERS": "개발자" } diff --git a/packages/website/translations/russian.json b/packages/website/translations/russian.json index a4e47264b..c103960c0 100644 --- a/packages/website/translations/russian.json +++ b/packages/website/translations/russian.json @@ -3,7 +3,7 @@ "TOP_TAGLINE": "0x — это протокол с открытым кодом, позволяющий торговать токенами ERC20, на блокчейне Ethereum.", "BUILD_CALL_TO_ACTION": "Разрабатывайте на 0x", "COMMUNITY_CALL_TO_ACTION": "Сообщество", - "PROJECTS_HEADER": "Прожкты разработанные на 0х", + "PROJECTS_HEADER": "Проекты разработанные на 0х", "FULL_LIST_PROMPT": "Просмотреть", "FULL_LIST_LINK": "полный список", "TOKENIZED_SECTION_HEADER": "Сегодняшний мир движется к токенизации ценности", diff --git a/packages/website/ts/components/footer.tsx b/packages/website/ts/components/footer.tsx index de20d074d..810460cac 100644 --- a/packages/website/ts/components/footer.tsx +++ b/packages/website/ts/components/footer.tsx @@ -201,11 +201,9 @@ export class Footer extends React.Component<FooterProps, FooterState> { {item.isExternal ? ( <a className="text-decoration-none" style={linkStyle} target="_blank" href={item.path}> {!_.isUndefined(iconIfExists) ? ( - <div className="sm-mx-auto" style={{ width: 65 }}> - <div className="flex"> - <div className="pr1">{this._renderIcon(iconIfExists)}</div> - <div>{item.title}</div> - </div> + <div className="inline-block"> + <div className="pr1 table-cell">{this._renderIcon(iconIfExists)}</div> + <div className="table-cell">{item.title}</div> </div> ) : ( item.title diff --git a/packages/website/ts/containers/connect_documentation.tsx b/packages/website/ts/containers/connect_documentation.tsx index bff8db35d..d11bab924 100644 --- a/packages/website/ts/containers/connect_documentation.tsx +++ b/packages/website/ts/containers/connect_documentation.tsx @@ -64,6 +64,7 @@ const docsInfoConfig: DocsInfoConfig = { 'TokenPairsRequest', 'TokenPairsRequestOpts', 'TokenTradeInfo', + 'WebSocketOrderbookChannelConfig', 'Order', 'SignedOrder', 'ECSignature', |