From 96b4a283ba2f24c282df472d2b194754b15ed717 Mon Sep 17 00:00:00 2001 From: Jascha Ehrenreich Date: Sun, 17 Apr 2016 14:04:30 +0200 Subject: [PATCH 1/7] fix typo --- test/swatches/Swatches.test.js | 2 +- test/swatches/SwatchesGroup.test.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/test/swatches/Swatches.test.js b/test/swatches/Swatches.test.js index 8ebc7ed5..66f21b57 100644 --- a/test/swatches/Swatches.test.js +++ b/test/swatches/Swatches.test.js @@ -21,7 +21,7 @@ describe('Swatches', () => { expect(props.onChange).to.have.been.called }) - it('should render SwatchesGoup for each top-level array passed to props.colors', () => { + it('should render SwatchesGroup for each top-level array passed to props.colors', () => { const SwatchesComponent = TestUtils.renderIntoDocument() let groups = SwatchesComponent.refs.body._reactInternalComponent._renderedChildren let groupCount = 0 diff --git a/test/swatches/SwatchesGroup.test.js b/test/swatches/SwatchesGroup.test.js index c0db38f4..421aef36 100644 --- a/test/swatches/SwatchesGroup.test.js +++ b/test/swatches/SwatchesGroup.test.js @@ -21,7 +21,7 @@ describe('SwatchesGroup', () => { expect(props.onClick).to.have.been.called }) - it('should render SwatchesGroupGoup for each top-level array passed to props.colors', () => { + it('should render SwatchesGroup for each top-level array passed to props.colors', () => { const SwatchesGroup = TestUtils.renderIntoDocument() let colors = SwatchesGroup.refs.group._reactInternalComponent._renderedChildren let colorCount = 0 From 1deeb9dc96a3fb0e3fc0d52bd907b027648410fd Mon Sep 17 00:00:00 2001 From: Jascha Ehrenreich Date: Sun, 17 Apr 2016 15:24:10 +0200 Subject: [PATCH 2/7] update deps --- package.json | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index f11ba28d..717f86cc 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "lodash.throttle": "^4.0.0", "material-colors": "^1.0.0", "merge": "^1.2.0", - "react-addons-shallow-compare": "^0.14.7", + "react-addons-shallow-compare": "^15.0.1", "reactcss": "^0.4.3", "tinycolor2": "^1.1.2" }, @@ -61,12 +61,13 @@ "chai-spies": "^0.7.1", "css-loader": "^0.23.1", "event-stream": "^3.3.1", - "highlight.js": "^8.7.0", - "html-loader": "^0.3.0", + "highlight.js": "^9.3.0", + "html-loader": "^0.4.3", "jsx-loader": "^0.13.2", "lodash": "^4.6.0", - "normalize.css": "^3.0.3", - "react-addons-test-utils": "^0.14.0", + "mocha": "2.4.5", + "normalize.css": "^4.1.1", + "react-addons-test-utils": "^15.0.1", "react-context": "0.0.3", "react-hot-loader": "^1.2.8", "react-map-styles": "^0.3.0", From bd8ebd9fa80232ab99cb47313c6c5ed3b7352ef2 Mon Sep 17 00:00:00 2001 From: Jascha Ehrenreich Date: Sun, 17 Apr 2016 22:20:24 +0200 Subject: [PATCH 3/7] update peerDependencies --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 717f86cc..22b61c38 100644 --- a/package.json +++ b/package.json @@ -45,8 +45,8 @@ "tinycolor2": "^1.1.2" }, "peerDependencies": { - "react": "^0.14.0", - "react-dom": "^0.14.0" + "react": "^15.0.1", + "react-dom": "^15.0.1" }, "devDependencies": { "babel-cli": "^6.5.1", From fccc2dea1c3d201da03812bbd05a4d8d3b434366 Mon Sep 17 00:00:00 2001 From: Jascha Ehrenreich Date: Sun, 17 Apr 2016 22:20:50 +0200 Subject: [PATCH 4/7] replace all css positional values of 0 with 0px --- src/components/chrome/Chrome.js | 2 +- src/components/common/Alpha.js | 6 +++--- src/components/common/Checkboard.js | 2 +- src/components/common/Hue.js | 4 ++-- src/components/common/Saturation.js | 6 +++--- src/components/compact/CompactFields.js | 2 +- src/components/material/Material.js | 8 ++++---- src/components/photoshop/PhotoshopFields.js | 6 +++--- src/components/sketched/Sketch.js | 2 +- 9 files changed, 19 insertions(+), 19 deletions(-) diff --git a/src/components/chrome/Chrome.js b/src/components/chrome/Chrome.js index 3875cdab..7792fe62 100644 --- a/src/components/chrome/Chrome.js +++ b/src/components/chrome/Chrome.js @@ -51,7 +51,7 @@ export class Chrome extends ReactCSS.Component { overflow: 'hidden', }, active: { - Absolute: '0 0 0 0', + Absolute: '0px 0px 0px 0px', zIndex: 2, borderRadius: '8px', boxShadow: 'inset 0 0 0 1px rgba(0,0,0,.1)', diff --git a/src/components/common/Alpha.js b/src/components/common/Alpha.js index 503bf62c..714ead08 100644 --- a/src/components/common/Alpha.js +++ b/src/components/common/Alpha.js @@ -13,15 +13,15 @@ export class Alpha extends ReactCSS.Component { return { 'default': { alpha: { - Absolute: '0 0 0 0', + Absolute: '0px 0px 0px 0px', borderRadius: this.props.radius, }, checkboard: { - Absolute: '0 0 0 0', + Absolute: '0px 0px 0px 0px', overflow: 'hidden', }, gradient: { - Absolute: '0 0 0 0', + Absolute: '0px 0px 0px 0px', background: 'linear-gradient(to right, rgba(' + this.props.rgb.r + ', ' + this.props.rgb.g + ', ' + this.props.rgb.b + ', 0) 0%, rgba(' + this.props.rgb.r + ', ' + this.props.rgb.g + ', ' + this.props.rgb.b + ', 1) 100%)', boxShadow: this.props.shadow, borderRadius: this.props.radius, diff --git a/src/components/common/Checkboard.js b/src/components/common/Checkboard.js index 2510ecda..33254fc9 100644 --- a/src/components/common/Checkboard.js +++ b/src/components/common/Checkboard.js @@ -41,7 +41,7 @@ export class Checkboard extends ReactCSS.Component { return { 'default': { grid: { - Absolute: '0 0 0 0', + Absolute: '0px 0px 0px 0px', background: 'url(' + background + ') center left', }, }, diff --git a/src/components/common/Hue.js b/src/components/common/Hue.js index 4ed85f3d..20586863 100644 --- a/src/components/common/Hue.js +++ b/src/components/common/Hue.js @@ -11,7 +11,7 @@ export class Hue extends ReactCSS.Component { return { 'default': { hue: { - Absolute: '0 0 0 0', + Absolute: '0px 0px 0px 0px', background: 'linear-gradient(to right, #f00 0%, #ff0 17%, #0f0 33%, #0ff 50%, #00f 67%, #f0f 83%, #f00 100%)', borderRadius: this.props.radius, boxShadow: this.props.shadow, @@ -41,7 +41,7 @@ export class Hue extends ReactCSS.Component { background: 'linear-gradient(to top, #f00 0%, #ff0 17%, #0f0 33%, #0ff 50%, #00f 67%, #f0f 83%, #f00 100%)', }, pointer: { - left: '0', + left: '0px', top: -((this.props.hsl.h * 100) / 360) + 100 + '%', }, }, diff --git a/src/components/common/Saturation.js b/src/components/common/Saturation.js index c6d880e2..272af0da 100644 --- a/src/components/common/Saturation.js +++ b/src/components/common/Saturation.js @@ -20,16 +20,16 @@ export class Saturation extends ReactCSS.Component { return { 'default': { color: { - Absolute: '0 0 0 0', + Absolute: '0px 0px 0px 0px', background: 'hsl(' + this.props.hsl.h + ',100%, 50%)', borderRadius: this.props.radius, }, white: { - Absolute: '0 0 0 0', + Absolute: '0px 0px 0px 0px', background: 'linear-gradient(to right, #fff, rgba(255,255,255,0))', }, black: { - Absolute: '0 0 0 0', + Absolute: '0px 0px 0px 0px', background: 'linear-gradient(to top, #000, rgba(0,0,0,0))', boxShadow: this.props.shadow, }, diff --git a/src/components/compact/CompactFields.js b/src/components/compact/CompactFields.js index 6cd92b5b..68b88004 100644 --- a/src/components/compact/CompactFields.js +++ b/src/components/compact/CompactFields.js @@ -68,7 +68,7 @@ export class CompactColor extends ReactCSS.Component { label: { position: 'absolute', top: '3px', - left: '0', + left: '0px', lineHeight: '16px', textTransform: 'uppercase', fontSize: '12px', diff --git a/src/components/material/Material.js b/src/components/material/Material.js index 5a6d548d..21afbdac 100644 --- a/src/components/material/Material.js +++ b/src/components/material/Material.js @@ -38,8 +38,8 @@ export class Material extends ReactCSS.Component { }, label: { position: 'absolute', - top: '0', - left: '0', + top: '0px', + left: '0px', fontSize: '11px', color: '#999999', textTransform: 'capitalize', @@ -64,8 +64,8 @@ export class Material extends ReactCSS.Component { }, label: { position: 'absolute', - top: '0', - left: '0', + top: '0px', + left: '0px', fontSize: '11px', color: '#999999', textTransform: 'capitalize', diff --git a/src/components/photoshop/PhotoshopFields.js b/src/components/photoshop/PhotoshopFields.js index 7959d413..1bddbc56 100644 --- a/src/components/photoshop/PhotoshopFields.js +++ b/src/components/photoshop/PhotoshopFields.js @@ -39,7 +39,7 @@ export class PhotoshopPicker extends ReactCSS.Component { marginRight: '10px', }, label: { - left: '0', + left: '0px', width: '34px', textTransform: 'uppercase', fontSize: '13px', @@ -66,8 +66,8 @@ export class PhotoshopPicker extends ReactCSS.Component { }, label: { position: 'absolute', - top: '0', - left: '0', + top: '0px', + left: '0px', width: '14px', textTransform: 'uppercase', fontSize: '13px', diff --git a/src/components/sketched/Sketch.js b/src/components/sketched/Sketch.js index b19fe2d1..84b58a6b 100644 --- a/src/components/sketched/Sketch.js +++ b/src/components/sketched/Sketch.js @@ -48,7 +48,7 @@ export class Sketch extends ReactCSS.Component { borderRadius: '3px', }, activeColor: { - Absolute: '0 0 0 0', + Absolute: '0px 0px 0px 0px', borderRadius: '2px', background: 'rgba(' + this.props.rgb.r + ', ' + this.props.rgb.g + ', ' + this.props.rgb.b + ', ' + this.props.rgb.a + ')', boxShadow: 'inset 0 0 0 1px rgba(0,0,0,.15), inset 0 0 4px rgba(0,0,0,.25)', From 6da514beecf2c327ede984b5653b10a7282d3c57 Mon Sep 17 00:00:00 2001 From: Jascha Ehrenreich Date: Sun, 17 Apr 2016 22:22:07 +0200 Subject: [PATCH 5/7] transpile lib --- lib/components/chrome/Chrome.js | 2 +- lib/components/common/Alpha.js | 6 +++--- lib/components/common/Checkboard.js | 2 +- lib/components/common/Hue.js | 4 ++-- lib/components/common/Saturation.js | 6 +++--- lib/components/compact/CompactFields.js | 2 +- lib/components/material/Material.js | 8 ++++---- lib/components/photoshop/PhotoshopFields.js | 6 +++--- lib/components/sketched/Sketch.js | 2 +- 9 files changed, 19 insertions(+), 19 deletions(-) diff --git a/lib/components/chrome/Chrome.js b/lib/components/chrome/Chrome.js index 818af5c9..1d0e6164 100644 --- a/lib/components/chrome/Chrome.js +++ b/lib/components/chrome/Chrome.js @@ -102,7 +102,7 @@ var Chrome = exports.Chrome = function (_ReactCSS$Component) { overflow: 'hidden' }, active: { - Absolute: '0 0 0 0', + Absolute: '0px 0px 0px 0px', zIndex: 2, borderRadius: '8px', boxShadow: 'inset 0 0 0 1px rgba(0,0,0,.1)', diff --git a/lib/components/common/Alpha.js b/lib/components/common/Alpha.js index 040bbf46..dadc7750 100644 --- a/lib/components/common/Alpha.js +++ b/lib/components/common/Alpha.js @@ -86,15 +86,15 @@ var Alpha = exports.Alpha = function (_ReactCSS$Component) { return { 'default': { alpha: { - Absolute: '0 0 0 0', + Absolute: '0px 0px 0px 0px', borderRadius: this.props.radius }, checkboard: { - Absolute: '0 0 0 0', + Absolute: '0px 0px 0px 0px', overflow: 'hidden' }, gradient: { - Absolute: '0 0 0 0', + Absolute: '0px 0px 0px 0px', background: 'linear-gradient(to right, rgba(' + this.props.rgb.r + ', ' + this.props.rgb.g + ', ' + this.props.rgb.b + ', 0) 0%, rgba(' + this.props.rgb.r + ', ' + this.props.rgb.g + ', ' + this.props.rgb.b + ', 1) 100%)', boxShadow: this.props.shadow, borderRadius: this.props.radius diff --git a/lib/components/common/Checkboard.js b/lib/components/common/Checkboard.js index cd7d525a..4e756581 100644 --- a/lib/components/common/Checkboard.js +++ b/lib/components/common/Checkboard.js @@ -79,7 +79,7 @@ var Checkboard = exports.Checkboard = function (_ReactCSS$Component) { return { 'default': { grid: { - Absolute: '0 0 0 0', + Absolute: '0px 0px 0px 0px', background: 'url(' + background + ') center left' } } diff --git a/lib/components/common/Hue.js b/lib/components/common/Hue.js index 6dc70571..09647235 100644 --- a/lib/components/common/Hue.js +++ b/lib/components/common/Hue.js @@ -104,7 +104,7 @@ var Hue = exports.Hue = function (_ReactCSS$Component) { return { 'default': { hue: { - Absolute: '0 0 0 0', + Absolute: '0px 0px 0px 0px', background: 'linear-gradient(to right, #f00 0%, #ff0 17%, #0f0 33%, #0ff 50%, #00f 67%, #f0f 83%, #f00 100%)', borderRadius: this.props.radius, boxShadow: this.props.shadow @@ -134,7 +134,7 @@ var Hue = exports.Hue = function (_ReactCSS$Component) { background: 'linear-gradient(to top, #f00 0%, #ff0 17%, #0f0 33%, #0ff 50%, #00f 67%, #f0f 83%, #f00 100%)' }, pointer: { - left: '0', + left: '0px', top: -(this.props.hsl.h * 100 / 360) + 100 + '%' } } diff --git a/lib/components/common/Saturation.js b/lib/components/common/Saturation.js index 2e0a0a5a..b6560402 100644 --- a/lib/components/common/Saturation.js +++ b/lib/components/common/Saturation.js @@ -92,16 +92,16 @@ var Saturation = exports.Saturation = function (_ReactCSS$Component) { return { 'default': { color: { - Absolute: '0 0 0 0', + Absolute: '0px 0px 0px 0px', background: 'hsl(' + this.props.hsl.h + ',100%, 50%)', borderRadius: this.props.radius }, white: { - Absolute: '0 0 0 0', + Absolute: '0px 0px 0px 0px', background: 'linear-gradient(to right, #fff, rgba(255,255,255,0))' }, black: { - Absolute: '0 0 0 0', + Absolute: '0px 0px 0px 0px', background: 'linear-gradient(to top, #000, rgba(0,0,0,0))', boxShadow: this.props.shadow }, diff --git a/lib/components/compact/CompactFields.js b/lib/components/compact/CompactFields.js index 143378cf..6ff8c16a 100644 --- a/lib/components/compact/CompactFields.js +++ b/lib/components/compact/CompactFields.js @@ -122,7 +122,7 @@ var CompactColor = exports.CompactColor = function (_ReactCSS$Component) { label: { position: 'absolute', top: '3px', - left: '0', + left: '0px', lineHeight: '16px', textTransform: 'uppercase', fontSize: '12px', diff --git a/lib/components/material/Material.js b/lib/components/material/Material.js index 0d27db77..0bedc6c2 100644 --- a/lib/components/material/Material.js +++ b/lib/components/material/Material.js @@ -96,8 +96,8 @@ var Material = exports.Material = function (_ReactCSS$Component) { }, label: { position: 'absolute', - top: '0', - left: '0', + top: '0px', + left: '0px', fontSize: '11px', color: '#999999', textTransform: 'capitalize' @@ -122,8 +122,8 @@ var Material = exports.Material = function (_ReactCSS$Component) { }, label: { position: 'absolute', - top: '0', - left: '0', + top: '0px', + left: '0px', fontSize: '11px', color: '#999999', textTransform: 'capitalize' diff --git a/lib/components/photoshop/PhotoshopFields.js b/lib/components/photoshop/PhotoshopFields.js index 589d7fb9..a47bfe93 100644 --- a/lib/components/photoshop/PhotoshopFields.js +++ b/lib/components/photoshop/PhotoshopFields.js @@ -103,7 +103,7 @@ var PhotoshopPicker = exports.PhotoshopPicker = function (_ReactCSS$Component) { marginRight: '10px' }, label: { - left: '0', + left: '0px', width: '34px', textTransform: 'uppercase', fontSize: '13px', @@ -130,8 +130,8 @@ var PhotoshopPicker = exports.PhotoshopPicker = function (_ReactCSS$Component) { }, label: { position: 'absolute', - top: '0', - left: '0', + top: '0px', + left: '0px', width: '14px', textTransform: 'uppercase', fontSize: '13px', diff --git a/lib/components/sketched/Sketch.js b/lib/components/sketched/Sketch.js index b70f90de..bee5b7a6 100644 --- a/lib/components/sketched/Sketch.js +++ b/lib/components/sketched/Sketch.js @@ -96,7 +96,7 @@ var Sketch = exports.Sketch = function (_ReactCSS$Component) { borderRadius: '3px' }, activeColor: { - Absolute: '0 0 0 0', + Absolute: '0px 0px 0px 0px', borderRadius: '2px', background: 'rgba(' + this.props.rgb.r + ', ' + this.props.rgb.g + ', ' + this.props.rgb.b + ', ' + this.props.rgb.a + ')', boxShadow: 'inset 0 0 0 1px rgba(0,0,0,.15), inset 0 0 4px rgba(0,0,0,.25)', From f3e64cfe805fabe7a181896a977bce1b909856bd Mon Sep 17 00:00:00 2001 From: Jascha Ehrenreich Date: Sun, 17 Apr 2016 22:22:58 +0200 Subject: [PATCH 6/7] update doc reference to bottom: 0 to 0px --- docs/components/home/HomeFeature.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/components/home/HomeFeature.js b/docs/components/home/HomeFeature.js index df70092d..fd2761d9 100644 --- a/docs/components/home/HomeFeature.js +++ b/docs/components/home/HomeFeature.js @@ -99,7 +99,7 @@ class HomeFeature extends ReactCSS.Component { justifyContent: 'space-between', alignItems: 'flex-end', position: 'absolute', - bottom: '0', + bottom: '0px', width: '100%', }, From a6976786451b8f93000b55eaafdcc2ff92910be7 Mon Sep 17 00:00:00 2001 From: Jascha Ehrenreich Date: Sun, 17 Apr 2016 22:24:55 +0200 Subject: [PATCH 7/7] examples: replace css positional values of 0 with 0px --- examples/Button.js | 8 ++++---- examples/Sketch.js | 8 ++++---- examples/button.md | 8 ++++---- examples/sketch.md | 8 ++++---- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/examples/Button.js b/examples/Button.js index afd18311..b76c02a5 100644 --- a/examples/Button.js +++ b/examples/Button.js @@ -23,10 +23,10 @@ class ButtonExample extends React.Component { } const cover = { position: 'fixed', - top: '0', - right: '0', - bottom: '0', - left: '0', + top: '0px', + right: '0px', + bottom: '0px', + left: '0px', } return (
diff --git a/examples/Sketch.js b/examples/Sketch.js index 62074d9a..be20ef2b 100644 --- a/examples/Sketch.js +++ b/examples/Sketch.js @@ -38,10 +38,10 @@ class SketchExample extends ReactCSS.Component { }, cover: { position: 'fixed', - top: '0', - right: '0', - bottom: '0', - left: '0', + top: '0px', + right: '0px', + bottom: '0px', + left: '0px', }, }, } diff --git a/examples/button.md b/examples/button.md index 1672d486..c6ae1d65 100644 --- a/examples/button.md +++ b/examples/button.md @@ -24,10 +24,10 @@ class ButtonExample extends React.Component { } const cover = { position: 'fixed', - top: '0', - right: '0', - bottom: '0', - left: '0', + top: '0px', + right: '0px', + bottom: '0px', + left: '0px', } return (
diff --git a/examples/sketch.md b/examples/sketch.md index 941b70dc..1f5a3b4d 100644 --- a/examples/sketch.md +++ b/examples/sketch.md @@ -39,10 +39,10 @@ class SketchExample extends ReactCSS.Component { }, cover: { position: 'fixed', - top: '0', - right: '0', - bottom: '0', - left: '0', + top: '0px', + right: '0px', + bottom: '0px', + left: '0px', }, }, }