diff options
author | Brandon Millman <brandon.millman@gmail.com> | 2018-11-14 03:38:20 +0800 |
---|---|---|
committer | Brandon Millman <brandon.millman@gmail.com> | 2018-11-14 03:38:20 +0800 |
commit | 3a3fe0e69acdc3a7aac16c4a64054d71a0689279 (patch) | |
tree | 1a394dd9c9db95ccba548688e62d9266c0774324 /packages/react-shared | |
parent | baba78f545110c469e3ac1d29d9f3e89586597ca (diff) | |
parent | 5c21d3f6af2ffc513b2bbfe92abf99181a32ceca (diff) | |
download | dexon-sol-tools-3a3fe0e69acdc3a7aac16c4a64054d71a0689279.tar dexon-sol-tools-3a3fe0e69acdc3a7aac16c4a64054d71a0689279.tar.gz dexon-sol-tools-3a3fe0e69acdc3a7aac16c4a64054d71a0689279.tar.bz2 dexon-sol-tools-3a3fe0e69acdc3a7aac16c4a64054d71a0689279.tar.lz dexon-sol-tools-3a3fe0e69acdc3a7aac16c4a64054d71a0689279.tar.xz dexon-sol-tools-3a3fe0e69acdc3a7aac16c4a64054d71a0689279.tar.zst dexon-sol-tools-3a3fe0e69acdc3a7aac16c4a64054d71a0689279.zip |
Merge branch 'development' into fix/asset-buyer/price-per-token
* development:
Publish
Updated CHANGELOGS
Fix a bug when undefined was been tried to convert to an array
feat(instant): add extra asset metadata
chore: fix linter error
Improve logo spacing
fix: lowercase supplied address before comparing with derived addresses (which are not checksummed)
Remove unused instance variable
update yarn.lock
Increase logo size
Replace remaining scroll-links with Link component
Adjust paddin
Fix menuItem background colors depending on the context
Remove "Home" menu item, instead make different parts of logo link to different sections of the website
Rename tutorial to match verb structure
chore: Make `External exports` clickable on sidebar
style: reduce border size on version dropdown
style: make line-height of sidebar title 26px, make sure still bottom aligned with version picker
Update yarn.lock
style: remove small gap under topbar
Diffstat (limited to 'packages/react-shared')
-rw-r--r-- | packages/react-shared/CHANGELOG.json | 9 | ||||
-rw-r--r-- | packages/react-shared/CHANGELOG.md | 4 | ||||
-rw-r--r-- | packages/react-shared/package.json | 4 | ||||
-rw-r--r-- | packages/react-shared/src/components/anchor_title.tsx | 18 |
4 files changed, 18 insertions, 17 deletions
diff --git a/packages/react-shared/CHANGELOG.json b/packages/react-shared/CHANGELOG.json index 4394eeb2e..a54d7d1dc 100644 --- a/packages/react-shared/CHANGELOG.json +++ b/packages/react-shared/CHANGELOG.json @@ -1,5 +1,14 @@ [ { + "timestamp": 1542134075, + "version": "1.0.20", + "changes": [ + { + "note": "Dependencies updated" + } + ] + }, + { "timestamp": 1542028948, "version": "1.0.19", "changes": [ diff --git a/packages/react-shared/CHANGELOG.md b/packages/react-shared/CHANGELOG.md index 4104628bc..93a6b2694 100644 --- a/packages/react-shared/CHANGELOG.md +++ b/packages/react-shared/CHANGELOG.md @@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only. CHANGELOG +## v1.0.20 - _November 13, 2018_ + + * Dependencies updated + ## v1.0.19 - _November 12, 2018_ * Dependencies updated diff --git a/packages/react-shared/package.json b/packages/react-shared/package.json index 1336ce2dd..e372178b1 100644 --- a/packages/react-shared/package.json +++ b/packages/react-shared/package.json @@ -1,6 +1,6 @@ { "name": "@0x/react-shared", - "version": "1.0.19", + "version": "1.0.20", "engines": { "node": ">=6.12" }, @@ -25,7 +25,7 @@ "url": "https://github.com/0xProject/0x-monorepo.git" }, "devDependencies": { - "@0x/dev-utils": "^1.0.15", + "@0x/dev-utils": "^1.0.16", "@0x/tslint-config": "^1.0.10", "make-promises-safe": "^1.1.0", "shx": "^0.2.2", diff --git a/packages/react-shared/src/components/anchor_title.tsx b/packages/react-shared/src/components/anchor_title.tsx index bd99edcab..a9105e132 100644 --- a/packages/react-shared/src/components/anchor_title.tsx +++ b/packages/react-shared/src/components/anchor_title.tsx @@ -1,15 +1,9 @@ import * as React from 'react'; -import { Link as ScrollLink } from 'react-scroll'; import styled from 'styled-components'; +import { Link } from '../components/link'; import { HeaderSizes, Styles } from '../types'; import { colors } from '../utils/colors'; -import { constants } from '../utils/constants'; - -const headerSizeToScrollOffset: { [headerSize: string]: number } = { - h2: -20, - h3: 0, -}; export interface AnchorTitleProps { title: string | React.ReactNode; @@ -73,15 +67,9 @@ export class AnchorTitle extends React.Component<AnchorTitleProps, AnchorTitleSt {this.props.title} </div> {!this.props.isDisabled && ( - <ScrollLink - to={this.props.id} - hashSpy={true} - offset={headerSizeToScrollOffset[this.props.headerSize]} - duration={constants.DOCS_SCROLL_DURATION_MS} - containerId={constants.SCROLL_CONTAINER_ID} - > + <Link to={this.props.id}> <AnchorIcon className="zmdi zmdi-link" shouldShowAnchor={this.props.shouldShowAnchor} /> - </ScrollLink> + </Link> )} </div> ); |