Skip to content

Commit

Permalink
Merge pull request reactjs#28 from peterjmag/use-classnames-module
Browse files Browse the repository at this point in the history
Use classnames instead of react/lib/cx
  • Loading branch information
mzabriskie committed May 8, 2015
2 parents e06e801 + 930c4ca commit 494d7d2
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion lib/components/ModalPortal.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ var React = require('react');
var div = React.DOM.div;
var focusManager = require('../helpers/focusManager');
var scopeTab = require('../helpers/scopeTab');
var cx = require('react/lib/cx');
var cx = require('classnames');

// so that our CSS is statically analyzable
var CLASS_NAMES = {
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,9 @@
"webpack-dev-server": "1.6.5"
},
"peerDependencies": {
"react": ">=0.12.0"
"react": ">=0.12.0",
"classnames": "^1.2.0"
},
"dependencies": {},
"tags": [
"react",
"modal",
Expand Down

0 comments on commit 494d7d2

Please sign in to comment.