Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

use react 15.0.1 #132

Closed
wants to merge 7 commits into from
Closed

use react 15.0.1 #132

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
96b4a28
fix typo
jaeh Apr 17, 2016
1deeb9d
update deps
jaeh Apr 17, 2016
bd8ebd9
update peerDependencies
jaeh Apr 17, 2016
fccc2de
replace all css positional values of 0 with 0px
jaeh Apr 17, 2016
6da514b
transpile lib
jaeh Apr 17, 2016
f3e64cf
update doc reference to bottom: 0 to 0px
jaeh Apr 17, 2016
a697678
examples: replace css positional values of 0 with 0px
jaeh Apr 17, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docs/components/home/HomeFeature.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ class HomeFeature extends ReactCSS.Component {
justifyContent: 'space-between',
alignItems: 'flex-end',
position: 'absolute',
bottom: '0',
bottom: '0px',
width: '100%',
},

Expand Down
8 changes: 4 additions & 4 deletions examples/Button.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
<div>
Expand Down
8 changes: 4 additions & 4 deletions examples/Sketch.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
},
},
}
Expand Down
8 changes: 4 additions & 4 deletions examples/button.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
<div>
Expand Down
8 changes: 4 additions & 4 deletions examples/sketch.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
},
},
}
Expand Down
2 changes: 1 addition & 1 deletion lib/components/chrome/Chrome.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)',
Expand Down
6 changes: 3 additions & 3 deletions lib/components/common/Alpha.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion lib/components/common/Checkboard.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
}
}
Expand Down
4 changes: 2 additions & 2 deletions lib/components/common/Hue.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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 + '%'
}
}
Expand Down
6 changes: 3 additions & 3 deletions lib/components/common/Saturation.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
},
Expand Down
2 changes: 1 addition & 1 deletion lib/components/compact/CompactFields.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
8 changes: 4 additions & 4 deletions lib/components/material/Material.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand All @@ -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'
Expand Down
6 changes: 3 additions & 3 deletions lib/components/photoshop/PhotoshopFields.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ var PhotoshopPicker = exports.PhotoshopPicker = function (_ReactCSS$Component) {
marginRight: '10px'
},
label: {
left: '0',
left: '0px',
width: '34px',
textTransform: 'uppercase',
fontSize: '13px',
Expand All @@ -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',
Expand Down
2 changes: 1 addition & 1 deletion lib/components/sketched/Sketch.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)',
Expand Down
15 changes: 8 additions & 7 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,13 +40,13 @@
"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"
},
"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",
Expand All @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion src/components/chrome/Chrome.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)',
Expand Down
6 changes: 3 additions & 3 deletions src/components/common/Alpha.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion src/components/common/Checkboard.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
},
},
Expand Down
4 changes: 2 additions & 2 deletions src/components/common/Hue.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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 + '%',
},
},
Expand Down
6 changes: 3 additions & 3 deletions src/components/common/Saturation.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
},
Expand Down
2 changes: 1 addition & 1 deletion src/components/compact/CompactFields.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
8 changes: 4 additions & 4 deletions src/components/material/Material.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand All @@ -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',
Expand Down
6 changes: 3 additions & 3 deletions src/components/photoshop/PhotoshopFields.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ export class PhotoshopPicker extends ReactCSS.Component {
marginRight: '10px',
},
label: {
left: '0',
left: '0px',
width: '34px',
textTransform: 'uppercase',
fontSize: '13px',
Expand All @@ -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',
Expand Down
2 changes: 1 addition & 1 deletion src/components/sketched/Sketch.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)',
Expand Down
2 changes: 1 addition & 1 deletion test/swatches/Swatches.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(<Swatches {...props} colors={[['#333'], ['#fff'], ['#aaa'], ['#ddd']]} />)
let groups = SwatchesComponent.refs.body._reactInternalComponent._renderedChildren
let groupCount = 0
Expand Down
2 changes: 1 addition & 1 deletion test/swatches/SwatchesGroup.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(<SwatchesGroupComponent {...props} group={['#333', '#fff', '#aaa', '#ddd']} />)
let colors = SwatchesGroup.refs.group._reactInternalComponent._renderedChildren
let colorCount = 0
Expand Down