aboutsummaryrefslogtreecommitdiffstats
path: root/packages/website
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'v2-prototype' into refactor/move-spawn-switch-to-utilsFabio Berger2018-06-0778-220/+308
|\
| * Run prettierfragosti2018-06-071-9/+1
| * Remove unused variablefragosti2018-06-071-1/+0
| * Merge branch 'v2-prototype' of https://github.com/0xProject/0x-monorepo into ...fragosti2018-06-079-39/+102
| |\
| | * Merge pull request #672 from 0xProject/feature/website/account-management-polishBrandon Millman2018-06-079-39/+102
| | |\
| | | * Change shouldRenderHeader prop to shouldHideHeaderBrandon Millman2018-06-075-13/+13
| | | * Fix undefined ether balanceBrandon Millman2018-06-063-9/+13
| | | * Make scrollability a prop on TradeHistoryBrandon Millman2018-06-062-3/+10
| | | * Fix EthWrappers background colorBrandon Millman2018-06-061-2/+2
| | | * Update GenerateOrderForm and FillOrder componentsBrandon Millman2018-06-064-6/+34
| | | * Update EthWrappers componentBrandon Millman2018-06-062-1/+7
| | | * Update TradeHistory componentBrandon Millman2018-06-062-3/+16
| | | * Hide action column on mainnetBrandon Millman2018-06-061-13/+14
| | | * Fix TokenBalances background colorBrandon Millman2018-06-061-1/+1
| | | * Add isFullWidth prop to TokenBalances componentBrandon Millman2018-06-062-1/+5
| * | | Fix linting issuesfragosti2018-06-071-3/+1
| * | | Merge branch 'v2-prototype' of https://github.com/0xProject/0x-monorepo into ...fragosti2018-06-0714-10/+184
| |\| |
| | * | Merge pull request #669 from 0xProject/bug/website/fix-balance-renderingBrandon Millman2018-06-071-9/+14
| | |\ \
| | | * | Update balance amount rendering logicBrandon Millman2018-06-061-9/+14
| | | |/
| | * | Merge pull request #653 from 0xProject/feature/ethereum-types-docsLeonid Logvinov2018-06-0713-1/+170
| | |\ \
| | | * | Add EthereumTypes to _renderDrawerLeonid Logvinov2018-06-071-0/+11
| | | * | Add a TODO comment on StructLog type in the docsLeonid Logvinov2018-06-051-1/+1
| | | * | Add a documentation page for ethereum typesLeonid Logvinov2018-06-0513-1/+159
| * | | | Get build and tests to passfragosti2018-06-071-1/+1
| * | | | Fix merge conflictfragosti2018-06-071-14/+0
| * | | | Merge branch 'v2-prototype' of https://github.com/0xProject/0x-monorepo into ...fragosti2018-06-071-1/+1
| |\| | |
| * | | | Fix remaining tslint issuesFabio Berger2018-06-065-26/+2
| * | | | merge v2-prototypeFabio Berger2018-06-0628-75/+449
| |\ \ \ \
| * | | | | Try enabling no-unused-variable...fragosti2018-06-0561-167/+22
* | | | | | Move spawnSwitchErr to @0xproject/utilsFabio Berger2018-06-064-8/+6
| |_|/ / / |/| | | |
* | | | | Merge v2-prototypeFabio Berger2018-06-0629-107/+436
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge branch 'v2-prototype' into fixes/misc-small-fixesFabio Berger2018-06-0629-107/+433
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | Remove TranslatedTextfragosti2018-06-061-15/+0
| | * | | Fix prettierBrandon Millman2018-06-061-1/+1
| | * | | Merge pull request #668 from 0xProject/feature/website/move-disclaimerBrandon Millman2018-06-061-16/+18
| | |\ \ \
| | | * | | Move portal disclaimer to the account management sectionBrandon Millman2018-06-061-16/+18
| | * | | | Move prices into portalBrandon Millman2018-06-062-30/+32
| | |/ / /
| | * | | Merge pull request #652 from 0xProject/feature/website/landing-subscribe-butt...Francesco Agosti2018-06-0628-61/+398
| | |\ \ \ | | | |/ / | | |/| |
| | | * | Use stricter check for subscribe input textfragosti2018-06-061-1/+2
| | | * | Make buttons stack on mobilefragosti2018-06-052-5/+6
| | | * | Do not show subscribe form if language is not englishfragosti2018-06-051-1/+1
| | | * | Address PR feedbackfragosti2018-06-057-39/+46
| | | * | Lint and cleanupfragosti2018-06-023-6/+6
| | | * | Merge branch 'feature/website/landing-subscribe-button' into feature/website/...fragosti2018-06-0229-50/+378
| | | |\ \ | | | | |/ | | | |/|
| | | | * Implement subscription formfragosti2018-06-027-68/+288
| | | | * Add styled-components and polishedfragosti2018-06-0220-19/+36
| | | | * Have basic newsletter subscribe form workingfragosti2018-06-026-2/+93
| * | | | Add `switch-default` tslint rule and add missing default statementFabio Berger2018-06-051-0/+3
| |/ / /
* / / / - Rename watch to watch_without_deps in sub-packages, so dev's don't confuse ...Fabio Berger2018-06-051-1/+1
|/ / /
* | | Address feedbackfragosti2018-06-054-14/+20
* | | Implement WETH step logic for continuefragosti2018-06-053-7/+14
* | | Move trackedTokenStateByAddress logic into portalfragosti2018-06-052-83/+100
|/ /
* | Merge pull request #648 from 0xProject/feature/website/fill-orderBrandon Millman2018-06-024-34/+75
|\ \
| * | Remove old parse codeBrandon Millman2018-06-021-26/+0
| * | Refactor order parser and add shared order support to new portalBrandon Millman2018-06-023-3/+43
| * | Add generate and fill order routesBrandon Millman2018-06-022-7/+34
* | | Only show ProviderDisplay in portalBrandon Millman2018-06-021-12/+14
* | | Improve sol-cov docsLeonid Logvinov2018-06-022-6/+78
|/ /
* | Fix missing keyBrandon Millman2018-06-011-1/+2
* | Update placeholder param orderingBrandon Millman2018-06-011-10/+21
* | Change userEtherBalanceInWei to optional so we can know if its loadingBrandon Millman2018-06-0113-22/+26
* | Add loading state to ProviderDisplayBrandon Millman2018-06-012-22/+39
* | TweaksBrandon Millman2018-06-012-8/+29
* | Add Placeholder componentBrandon Millman2018-06-011-14/+48
* | Add StandardIconRowBrandon Millman2018-06-011-34/+41
* | Split render into loading and loaadedBrandon Millman2018-06-011-5/+11
|/
* Remove some typesLeonid Logvinov2018-06-011-0/+2
* Remove published typesLeonid Logvinov2018-06-011-1/+1
* Merge pull request #635 from 0xProject/feature/website/custom-onboarding-tooltipFrancesco Agosti2018-05-3119-111/+444
|\
| * Onboarding: implement add ETH step, and stub for add WETH stepfragosti2018-05-307-47/+121
| * Address PR feedbackfragosti2018-05-307-40/+41
| * Remove react-joyride from depsfragosti2018-05-301-1/+0
| * Remove blacklist conceptfragosti2018-05-304-66/+20
| * Some cleanupfragosti2018-05-302-11/+13
| * Improve tooltip lookfragosti2018-05-307-13/+69
| * Add types for react-popper, remove types for react-joyridefragosti2018-05-302-17/+16
| * Replace react-joyride with react-popperfragosti2018-05-304-53/+63
| * Write custom tooltip componentfragosti2018-05-262-6/+56
| * Run linterfragosti2018-05-262-2/+5
| * Add localstorage helperfragosti2018-05-261-0/+16
| * Add next buttonfragosti2018-05-262-1/+11
| * Auto-show onboarding flow on first page viewfragosti2018-05-265-7/+53
| * Add ability to blacklist onboarding stepsfragosti2018-05-263-34/+92
| * Fix PortalOnboardingFlowPropsfragosti2018-05-261-1/+0
| * Implement metamask installation flowfragosti2018-05-266-19/+75
* | Fix unselected relayer drawer itemBrandon Millman2018-05-301-1/+1
* | Hide wallet management option and expand component on small screensBrandon Millman2018-05-262-15/+23
|/
* Merge pull request #620 from 0xProject/feature/website/relayer-emptyBrandon Millman2018-05-253-9/+31
|\
| * Implement design for relayers with no volume or tokensBrandon Millman2018-05-253-9/+31
* | Merge pull request #618 from 0xProject/feature/v2-migrationsLeonid Logvinov2018-05-251-0/+1
|\ \ | |/ |/|
| * Pin types version in websiteLeonid Logvinov2018-05-251-0/+1
* | Improve OnboardingFlow API and typescript typesfragosti2018-05-253-12/+8
* | Address PR feedbackfragosti2018-05-256-16/+16
* | Fix build errorsfragosti2018-05-252-12/+9
* | Fix issue where modal can be out of sync with app statefragosti2018-05-256-16/+51
* | Basic onboarding flow infrastructure set upfragosti2018-05-2514-37/+213
* | Merge pull request #612 from 0xProject/feature/website/add-redux-devtoolsFrancesco Agosti2018-05-252-1/+3
|\ \ | |/ |/|
| * Move to deps from devDeps and use in development onlyfragosti2018-05-232-2/+2
| * Add redux-devtools-extension to projectfragosti2018-05-232-2/+4
* | Merge pull request #615 from 0xProject/refactor/json-schemas/for-v2Fabio Berger2018-05-251-1/+6
|\ \
| * | Have source-map-loader ignore node_modules packagesFabio Berger2018-05-241-1/+6
* | | Merge pull request #613 from 0xProject/check-tx-receipt-statusAlex Browne2018-05-241-1/+1
|\ \ \
| * | | Check transaction receipt status codes where applicableAlex Browne2018-05-241-1/+1
| |/ /
* | | Use visibility property instead of placeholder div in wrap ether itemBrandon Millman2018-05-241-7/+4
* | | Merge branch 'v2-prototype' into feature/website/wallet-flex-boxBrandon Millman2018-05-2431-142/+168
|\| |
| * | Add missing dep to websiteFabio Berger2018-05-241-0/+1
| * | Fix prettierLeonid Logvinov2018-05-242-2/+6
| * | Fix prettierLeonid Logvinov2018-05-241-3/+1
| * | Remove 0x.js as a dependency from websiteLeonid Logvinov2018-05-2424-122/+137
| * | Update dogfood urlBrandon Millman2018-05-232-2/+2
| * | Merge branch 'development' into v2-prototypeLeonid Logvinov2018-05-231-8/+8
| |\ \
| | * | PublishLeonid Logvinov2018-05-231-8/+8
| * | | Merge branch 'v2-prototype' of github.com:0xProject/0x-monorepo into v2-proto...Fabio Berger2018-05-232-3/+10
| |\ \ \
| | * \ \ Merge pull request #605 from 0xProject/fix/multiple/build-errorsFabio Berger2018-05-232-3/+10
| | |\ \ \
| | | * | | Upgrade UglifyJS to include ES6 supportRemco Bloemen2018-05-222-3/+10
| * | | | | Fix tslintFabio Berger2018-05-232-4/+4
| |/ / / /
| * | | | merge developmentFabio Berger2018-05-233-7/+8
| |\ \ \ \ | | |/ / / | |/| / / | | |/ /
| | * | Merge pull request #594 from 0xProject/improvement/addCustomTslintRulesFabio Berger2018-05-233-7/+8
| | |\ \
| | | * \ Merge branch 'development' into improvement/addCustomTslintRulesFabio Berger2018-05-173-11/+11
| | | |\ \
| | | * \ \ Merge branch 'development' into improvement/addCustomTslintRulesFabio Berger2018-05-167-10/+31
| | | |\ \ \
| | | * | | | Fix TSLint rulesFabio Berger2018-05-163-7/+8
* | | | | | | Add missing keyBrandon Millman2018-05-221-3/+6
* | | | | | | Use flexbox for wrapped ether itemBrandon Millman2018-05-221-21/+29
* | | | | | | Re add wrapped ether itemBrandon Millman2018-05-221-7/+24
* | | | | | | Rewrite balance rows using flex boxBrandon Millman2018-05-223-122/+129
|/ / / / / /
* | | | | / merge developmentFabio Berger2018-05-223-8/+3
|\| | | | | | |_|_|_|/ |/| | | |
| * | | | Merge pull request #597 from 0xProject/make-promises-safeAlex Browne2018-05-181-1/+2
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | Use make-promises-safe to catch unhandled rejections in testsAlex Browne2018-05-171-1/+2
| * | | | Remove "Order utils" from menu for nowFabio Berger2018-05-171-6/+0
| * | | | Fix top tokens keyBrandon Millman2018-05-171-2/+8
| |/ / /
| * | / Improve about page descriptionsfragosti2018-05-171-3/+3
| | |/ | |/|
* | | PrettierBrandon Millman2018-05-191-1/+3
* | | Change number of columns in relayer index for small screensBrandon Millman2018-05-191-1/+1
* | | Wallet instead of balances for small screensBrandon Millman2018-05-191-23/+21
* | | Close drawer when new path is chosenBrandon Millman2018-05-191-0/+7
* | | Fix styling of portal menuBrandon Millman2018-05-194-20/+37
* | | Refactor portal specific colors out of react-sharedBrandon Millman2018-05-1910-12/+38
* | | Add custom styling for drawerBrandon Millman2018-05-193-16/+106
* | | Fix key issue for portal routesBrandon Millman2018-05-191-1/+7
* | | Fix responsiveness broken in rebaseBrandon Millman2018-05-191-13/+33
* | | Set up scaffolding for new drawerBrandon Millman2018-05-193-9/+28
* | | Hide wallet component for small screensBrandon Millman2018-05-191-0/+2
* | | Fix token link keyBrandon Millman2018-05-191-2/+8
* | | Modulate number of columns based on screenwidthBrandon Millman2018-05-192-4/+19
* | | Fix prettierBrandon Millman2018-05-192-22/+17
* | | Change my title to clarifyfragosti2018-05-181-1/+1
* | | Center all the thingsfragosti2018-05-184-11/+46
* | | Refactor code in response to CR feedbackfragosti2018-05-185-15/+12
* | | Remove duplicate function call to validatefragosti2018-05-181-1/+1
* | | Show error messages in the wrapped ether itemfragosti2018-05-186-23/+52
* | | Improve about page descriptionsfragosti2018-05-181-3/+3
* | | Fix tslint false positiveBrandon Millman2018-05-181-2/+9
* | | Fix spreadBrandon Millman2018-05-181-1/+1
* | | Refactor account management itmesBrandon Millman2018-05-181-74/+70
* | | Add loading componentBrandon Millman2018-05-183-50/+77
* | | Refactor a bunch of layouts into their own filesBrandon Millman2018-05-186-139/+176
* | | Add portal layout componentBrandon Millman2018-05-181-31/+36
* | | Get rid of extra curly bracketsBrandon Millman2018-05-181-9/+9
* | | Fix lint errorBrandon Millman2018-05-181-2/+1
* | | Fix commentsBrandon Millman2018-05-183-4/+10
* | | Wait for blockchain to display the account management routesBrandon Millman2018-05-184-47/+78
* | | Fix linter errors and relayer index reloadingBrandon Millman2018-05-183-14/+17
* | | Trade direct routeBrandon Millman2018-05-182-44/+37
* | | Add manage you wallet footerBrandon Millman2018-05-181-24/+41
* | | Add props to back buttonBrandon Millman2018-05-181-9/+13
* | | Back button and title componentsBrandon Millman2018-05-183-64/+112
* | | Implement new menu stylingBrandon Millman2018-05-182-4/+95
* | | Add menuBrandon Millman2018-05-182-20/+41
* | | Add routesBrandon Millman2018-05-181-2/+105
* | | Merge branch 'development' into v2-prototypeFabio Berger2018-05-1687-482/+542
|\| |
| * | Merge pull request #593 from 0xProject/bug/website/fix-cirular-dependencyFrancesco Agosti2018-05-163-11/+13
| |\ \
| | * | fix style errorsfragosti2018-05-162-2/+2
| | * | Fix circular dependencyfragosti2018-05-163-11/+13
| * | | Merge pull request #592 from 0xProject/feature/website/add-francesco-aboutFrancesco Agosti2018-05-162-3/+11
| |\ \ \ | | |/ / | |/| |
| | * | Add my profile image to imagesfragosti2018-05-161-0/+0
| | * | Add myself to about pagefragosti2018-05-161-3/+11
| * | | Add dogfood configs to websiteBrandon Millman2018-05-164-2/+10
| |/ /
| * | Merge pull request #578 from 0xProject/document-node-versionAlex Browne2018-05-161-0/+3
| |\ \ | | |/ | |/|
| | * Change minimum Node version to 6.12Alex Browne2018-05-151-1/+1
| | * Document Node.js version requirement and add it to package.jsonAlex Browne2018-05-151-0/+3
| * | Merge developmentFabio Berger2018-05-153-14/+47
| |\ \
| | * | Add hover state to top tokensBrandon Millman2018-05-151-10/+43
| | * | Change to weekly txn volumeBrandon Millman2018-05-152-4/+4
| | |/
| * / Move from using lerna multi-package commands to wsrun, update README's accord...Fabio Berger2018-05-152-6/+4
| |/
| * Add missing type definitionsLeonid Logvinov2018-05-1480-452/+460
* | Merge branch 'development' into v2-prototypeAmir Bandeali2018-05-1644-447/+1072
|\|
| * Merge branch 'development' into breakUp0xjsFabio Berger2018-05-1120-160/+171
| |\
| | * Merge pull request #574 from 0xProject/feature/rm-rf-deployerLeonid Logvinov2018-05-1118-148/+102
| | |\
| | | * Fix templatesLeonid Logvinov2018-05-101-1/+1
| | | * Remove unused deployer docs configsLeonid Logvinov2018-05-101-17/+4
| | | * Add a legacy endpoint for the deployerLeonid Logvinov2018-05-102-0/+5
| | | * Fix linter issuesLeonid Logvinov2018-05-101-1/+1
| | | * Rename deployer to sol-compilerLeonid Logvinov2018-05-1017-129/+92
| | | * Remove deployer from metacoin and contract testsLeonid Logvinov2018-05-101-2/+1
| | * | Merge pull request #580 from 0xProject/feature/website/remove-tokensBrandon Millman2018-05-112-12/+69
| | |\ \ | | | |/ | | |/|
| | | * Update wallet footer and add remove token functionalityBrandon Millman2018-05-102-12/+69
| * | | Merge branch 'development' into breakUp0xjsFabio Berger2018-05-1013-203/+596
| |\| |
| | * | Add fallback image support to relayer grid tileBrandon Millman2018-05-101-2/+36
| | * | Clear relayer grid state when fetchingBrandon Millman2018-05-101-0/+6
| | |/
| | * Implement loading and error state for relayer gridBrandon Millman2018-05-101-10/+50
| | * Fallback image for relayer grid tileBrandon Millman2018-05-102-2/+3
| | * Change relayer grid tile to link on headerBrandon Millman2018-05-101-17/+17
| | * Merge pull request #576 from 0xProject/feature/website/top-tokensBrandon Millman2018-05-093-41/+17
| | |\
| | | * Display top tokens from backendBrandon Millman2018-05-093-41/+17
| | * | Merge branch 'development' into feature/website/top-bar-redesignBrandon Millman2018-05-094-79/+92
| | |\|
| | | * Remove overflowZ property from portalBrandon Millman2018-05-091-1/+0
| | | * Fix typoBrandon Millman2018-05-091-1/+1
| | | * Only show untracked tokensBrandon Millman2018-05-091-1/+1
| | | * Make wallet scrollableBrandon Millman2018-05-091-9/+48
| | | * Add token flowBrandon Millman2018-05-094-69/+43
| | * | Suggestions and fix bad mergeBrandon Millman2018-05-092-21/+6
| | * | Merge branch 'development' into feature/website/top-bar-redesignBrandon Millman2018-05-0928-92/+304
| | |\|
| | | * Merge pull request #556 from 0xProject/feature/website/portal-v2Brandon Millman2018-05-093-3/+326
| | | |\
| | | | * Add headers to wallet and relayer indexBrandon Millman2018-05-052-2/+12
| | | | * Add scrolling to relayer indexBrandon Millman2018-05-052-2/+8
| | | | * Lay out wallet and relayersBrandon Millman2018-05-053-3/+310
| | | * | Update The Ocean logoFabio Berger2018-05-081-0/+0
| | * | | ProviderDisplay changesBrandon Millman2018-04-242-37/+28
| | * | | Top bar expanded display typeBrandon Millman2018-04-242-17/+33
| | * | | Relayer grid spacing tweaksBrandon Millman2018-04-241-2/+2
| | * | | Add headers to wallet and relayer indexBrandon Millman2018-04-242-2/+12
| | * | | Add scrolling to relayer indexBrandon Millman2018-04-242-2/+8
| | * | | Lay out wallet and relayersBrandon Millman2018-04-243-3/+310
| * | | | Fix website and 0x.js docsFabio Berger2018-05-102-19/+34
| | |/ / | |/| |
| * | | Publishcontracts@2.1.28@0xproject/website@0.0.32@0xproject/testnet-faucets@1.0.29@0xproject/sra-report@0.0.14@0xproject/sol-resolver@0.0.4@0xproject/react-docs-example@0.0.11@0xproject/migrations@0.0.5@0xproject/metacoin@0.0.6@0xproject/dev-utils@0.4.1@0xproject/base-contract@0.3.1Leonid Logvinov2018-05-051-8/+8
| * | | Fix type errors in CSS propertiesLeonid Logvinov2018-05-053-3/+3
| * | | Publish@0xproject/website@0.0.31@0xproject/react-docs@0.0.10@0xproject/react-docs-example@0.0.10Leonid Logvinov2018-05-051-3/+3
| * | | Upgrade react types versionLeonid Logvinov2018-05-051-1/+1
| * | | Publishcontracts@2.1.27@0xproject/website@0.0.30@0xproject/testnet-faucets@1.0.28@0xproject/sra-report@0.0.13Leonid Logvinov2018-05-051-2/+2
| | |/ | |/|
| * | Publishcontracts@2.1.26@0xproject/website@0.0.29@0xproject/testnet-faucets@1.0.27@0xproject/sra-report@0.0.12@0xproject/sol-resolver@0.0.3@0xproject/react-docs-example@0.0.9@0xproject/monorepo-scripts@0.1.19@0xproject/migrations@0.0.4@0xproject/metacoin@0.0.5@0xproject/dev-utils@0.4.0@0xproject/base-contract@0.3.0Leonid Logvinov2018-05-041-8/+8
| * | Add order utils docs to the menuLeonid Logvinov2018-05-047-0/+12
| * | Open relayer app when clicking on grid tileBrandon Millman2018-05-042-16/+20
| * | Add header images to relayer grid tilesBrandon Millman2018-05-042-4/+7
| * | Fix logo left padding on mobileFabio Berger2018-05-031-1/+1
| * | Add new section to homepageFabio Berger2018-05-031-0/+25
| * | Remove id property from WebsiteBackendRelayerInfoBrandon Millman2018-05-032-2/+1
| * | Move order utils to @0xproject/order-utilsLeonid Logvinov2018-05-027-1/+129
| * | Add Greg and Remco to the about pageBrandon Millman2018-05-024-1/+23
| * | Remove WETH special case, website backend handles this nowBrandon Millman2018-05-011-6/+2
| * | Hit website backend for price informationBrandon Millman2018-05-014-49/+12
| * | Style suggestionsBrandon Millman2018-04-281-15/+10
| * | Move quote currency string into configBrandon Millman2018-04-282-3/+3
| * | Merge branch 'development' into feature/website/crypto-compare-pricesBrandon Millman2018-04-276-26/+28
| |\ \
| | * \ Merge pull request #555 from 0xProject/feature/subproviders/upgrade-provider-...Jacob Evans2018-04-261-1/+1
| | |\ \
| | | * | Update Web3 Provider Engine to 14.0.4Jacob Evans2018-04-241-1/+1
| | | |/
| | * / Fix react type versions to avoid minor version bumps with breaking changesFabio Berger2018-04-241-1/+1
| | |/
| | * Fix lazy load component nameBrandon Millman2018-04-241-2/+2
| | * Rename Portal and PortalMenu components to LegacyPortal and LegacyPortalMenuBrandon Millman2018-04-245-23/+25
| * | Rename baseCurrency to quoteCurrencyBrandon Millman2018-04-231-3/+3
| * | Remove some unused importsBrandon Millman2018-04-231-2/+1
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-02 18:23:20 +0800