diff options
author | Leonid Logvinov <logvinov.leon@gmail.com> | 2019-01-14 19:17:12 +0800 |
---|---|---|
committer | Leonid Logvinov <logvinov.leon@gmail.com> | 2019-01-14 19:17:12 +0800 |
commit | bf183af9a42aefd1c639e5924ed93f93fd821378 (patch) | |
tree | fd2f875248d8ccd4f287c61e749787343cec5723 /packages/react-shared | |
parent | 2b8f0d887ad529bb0557a55c67cc162977c7b270 (diff) | |
parent | 797d7c7878e33ce012259a6a5db5335e9dc838ba (diff) | |
download | dexon-sol-tools-bf183af9a42aefd1c639e5924ed93f93fd821378.tar dexon-sol-tools-bf183af9a42aefd1c639e5924ed93f93fd821378.tar.gz dexon-sol-tools-bf183af9a42aefd1c639e5924ed93f93fd821378.tar.bz2 dexon-sol-tools-bf183af9a42aefd1c639e5924ed93f93fd821378.tar.lz dexon-sol-tools-bf183af9a42aefd1c639e5924ed93f93fd821378.tar.xz dexon-sol-tools-bf183af9a42aefd1c639e5924ed93f93fd821378.tar.zst dexon-sol-tools-bf183af9a42aefd1c639e5924ed93f93fd821378.zip |
Merge development
Diffstat (limited to 'packages/react-shared')
-rw-r--r-- | packages/react-shared/CHANGELOG.json | 12 | ||||
-rw-r--r-- | packages/react-shared/CHANGELOG.md | 4 | ||||
-rw-r--r-- | packages/react-shared/package.json | 14 | ||||
-rw-r--r-- | packages/react-shared/src/components/anchor_title.tsx | 21 |
4 files changed, 30 insertions, 21 deletions
diff --git a/packages/react-shared/CHANGELOG.json b/packages/react-shared/CHANGELOG.json index aaf2485d1..2494d1dae 100644 --- a/packages/react-shared/CHANGELOG.json +++ b/packages/react-shared/CHANGELOG.json @@ -1,10 +1,18 @@ [ { + "timestamp": 1547225310, + "version": "1.1.1", + "changes": [ + { + "note": "Dependencies updated" + } + ] + }, + { "version": "1.1.0", "changes": [ { - "note": - "Change implementation to use react-router-dom NavLink instead of Link. Expose `activeStyle` prop.", + "note": "Change implementation to use react-router-dom NavLink instead of Link. Expose `activeStyle` prop.", "pr": 1448 } ], diff --git a/packages/react-shared/CHANGELOG.md b/packages/react-shared/CHANGELOG.md index a8f2764dd..de3cbe10a 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.1.1 - _January 11, 2019_ + + * Dependencies updated + ## v1.1.0 - _January 9, 2019_ * Change implementation to use react-router-dom NavLink instead of Link. Expose `activeStyle` prop. (#1448) diff --git a/packages/react-shared/package.json b/packages/react-shared/package.json index 5754e238b..1d9eb246f 100644 --- a/packages/react-shared/package.json +++ b/packages/react-shared/package.json @@ -1,6 +1,6 @@ { "name": "@0x/react-shared", - "version": "1.1.0", + "version": "1.1.1", "engines": { "node": ">=6.12" }, @@ -25,15 +25,15 @@ "url": "https://github.com/0xProject/0x-monorepo.git" }, "devDependencies": { - "@0x/dev-utils": "^1.0.22", - "@0x/tslint-config": "^2.0.0", + "@0x/dev-utils": "^1.0.23", + "@0x/tslint-config": "^2.0.1", "make-promises-safe": "^1.1.0", "shx": "^0.2.2", "tslint": "^5.9.1", "typescript": "3.0.1" }, "dependencies": { - "@0x/types": "^1.5.0", + "@0x/types": "^1.5.1", "@material-ui/core": "^3.0.1", "@types/is-mobile": "0.3.0", "@types/lodash": "4.14.104", @@ -50,13 +50,13 @@ "is-mobile": "^0.2.2", "lodash": "^4.17.5", "material-ui": "^0.20.0", - "react": "^16.4.2", - "react-dom": "^16.4.2", + "react": "^16.5.2", + "react-dom": "^16.5.2", "react-highlight": "0xproject/react-highlight#2f40a42e0a3f0ad126f9f42d505b97b603fc7162", "react-markdown": "^3.2.2", "react-router-dom": "^4.1.1", "react-scroll": "0xproject/react-scroll#pr-330-and-replace-state", - "styled-components": "^3.3.0", + "styled-components": "^4.0.1", "valid-url": "^1.0.9" }, "publishConfig": { diff --git a/packages/react-shared/src/components/anchor_title.tsx b/packages/react-shared/src/components/anchor_title.tsx index a9105e132..fccd56de7 100644 --- a/packages/react-shared/src/components/anchor_title.tsx +++ b/packages/react-shared/src/components/anchor_title.tsx @@ -32,18 +32,15 @@ interface AnchorIconProps { shouldShowAnchor: boolean; } -const AnchorIcon = - styled.i < - AnchorIconProps > - ` - opacity: ${props => (props.shouldShowAnchor ? 1 : 0)}; - &:hover { - opacity: ${props => (props.shouldShowAnchor ? 0.6 : 0)}; - } - font-size: 20px; - transform: rotate(45deg); - cursor: pointer; - `; +const AnchorIcon = styled.i<AnchorIconProps>` + opacity: ${props => (props.shouldShowAnchor ? 1 : 0)}; + &:hover { + opacity: ${props => (props.shouldShowAnchor ? 0.6 : 0)}; + } + font-size: 20px; + transform: rotate(45deg); + cursor: pointer; +`; export class AnchorTitle extends React.Component<AnchorTitleProps, AnchorTitleState> { public static defaultProps: Partial<AnchorTitleProps> = { |