diff options
| author | Amir Bandeali <abandeali1@gmail.com> | 2018-05-16 03:52:49 +0800 |
|---|---|---|
| committer | Amir Bandeali <abandeali1@gmail.com> | 2018-05-16 03:52:49 +0800 |
| commit | 9e0471bfbb4bb2b3b490e10ce34b16c88e8bab9a (patch) | |
| tree | f72aae5170b6f1f6d3d70ebf6c03ed171680ff50 /packages/react-shared | |
| parent | 9744b1906a111aa0c65c8fafb4db66aef32a5a23 (diff) | |
| parent | 6aed4fb1ae27dabed027c855f2cbdc0bfb4f3b6b (diff) | |
| download | dexon-0x-contracts-9e0471bfbb4bb2b3b490e10ce34b16c88e8bab9a.tar dexon-0x-contracts-9e0471bfbb4bb2b3b490e10ce34b16c88e8bab9a.tar.gz dexon-0x-contracts-9e0471bfbb4bb2b3b490e10ce34b16c88e8bab9a.tar.bz2 dexon-0x-contracts-9e0471bfbb4bb2b3b490e10ce34b16c88e8bab9a.tar.lz dexon-0x-contracts-9e0471bfbb4bb2b3b490e10ce34b16c88e8bab9a.tar.xz dexon-0x-contracts-9e0471bfbb4bb2b3b490e10ce34b16c88e8bab9a.tar.zst dexon-0x-contracts-9e0471bfbb4bb2b3b490e10ce34b16c88e8bab9a.zip | |
Merge branch 'development' into v2-prototype
Diffstat (limited to 'packages/react-shared')
| -rw-r--r-- | packages/react-shared/CHANGELOG.json | 27 | ||||
| -rw-r--r-- | packages/react-shared/CHANGELOG.md | 14 | ||||
| -rw-r--r-- | packages/react-shared/package.json | 12 | ||||
| -rw-r--r-- | packages/react-shared/src/utils/colors.ts | 1 |
4 files changed, 47 insertions, 7 deletions
diff --git a/packages/react-shared/CHANGELOG.json b/packages/react-shared/CHANGELOG.json index 256174db9..1095c78ee 100644 --- a/packages/react-shared/CHANGELOG.json +++ b/packages/react-shared/CHANGELOG.json @@ -1,5 +1,32 @@ [ { + "timestamp": 1525477860, + "version": "0.1.6", + "changes": [ + { + "note": "Dependencies updated" + } + ] + }, + { + "timestamp": 1525466747, + "version": "0.1.5", + "changes": [ + { + "note": "Dependencies updated" + } + ] + }, + { + "timestamp": 1525428773, + "version": "0.1.4", + "changes": [ + { + "note": "Dependencies updated" + } + ] + }, + { "timestamp": 1524044013, "version": "0.1.3", "changes": [ diff --git a/packages/react-shared/CHANGELOG.md b/packages/react-shared/CHANGELOG.md index a3d65356a..51d804b63 100644 --- a/packages/react-shared/CHANGELOG.md +++ b/packages/react-shared/CHANGELOG.md @@ -5,11 +5,23 @@ Edit the package's CHANGELOG.json file only. CHANGELOG +## v0.1.6 - _May 5, 2018_ + + * Dependencies updated + +## v0.1.5 - _May 4, 2018_ + + * Dependencies updated + +## v0.1.4 - _May 4, 2018_ + + * Dependencies updated + ## v0.1.3 - _April 18, 2018_ * Dependencies updated -## v0.1.2 - _April 12, 2018_ +## v0.1.2 - _April 11, 2018_ * Dependencies updated diff --git a/packages/react-shared/package.json b/packages/react-shared/package.json index 0925704f9..b9a46376c 100644 --- a/packages/react-shared/package.json +++ b/packages/react-shared/package.json @@ -1,11 +1,11 @@ { "name": "@0xproject/react-shared", - "version": "0.1.3", + "version": "0.1.6", "description": "0x shared react components", "main": "lib/index.js", "types": "lib/index.d.ts", "scripts": { - "lint": "tslint --project . 'src/**/*.ts' 'src/**/*.tsx'", + "lint": "tslint --project .", "build": "tsc && copyfiles -u 2 './lib/monorepo_scripts/**/*' ./scripts", "build:watch": "tsc -w", "clean": "shx rm -rf lib scripts", @@ -22,9 +22,9 @@ "url": "https://github.com/0xProject/0x-monorepo.git" }, "devDependencies": { - "@0xproject/dev-utils": "^0.3.6", - "@0xproject/monorepo-scripts": "^0.1.18", - "@0xproject/tslint-config": "^0.4.16", + "@0xproject/dev-utils": "^0.4.1", + "@0xproject/monorepo-scripts": "^0.1.19", + "@0xproject/tslint-config": "^0.4.17", "copyfiles": "^1.2.0", "shx": "^0.2.2", "tslint": "^5.9.1", @@ -34,7 +34,7 @@ "@types/lodash": "4.14.104", "@types/material-ui": "0.18.0", "@types/node": "^8.0.53", - "@types/react": "16.0.41", + "@types/react": "16.3.13", "@types/react-dom": "^16.0.3", "@types/react-scroll": "0.0.31", "basscss": "^8.0.3", diff --git a/packages/react-shared/src/utils/colors.ts b/packages/react-shared/src/utils/colors.ts index 7613414ae..4617fa5dc 100644 --- a/packages/react-shared/src/utils/colors.ts +++ b/packages/react-shared/src/utils/colors.ts @@ -28,6 +28,7 @@ const baseColors = { linkBlue: '#1D5CDE', mediumBlue: '#488AEA', darkBlue: '#4D5481', + lightTurquois: '#aefcdc', turquois: '#058789', lightPurple: '#A81CA6', purple: '#690596', |