Skip to content

Commit 175835a

Browse files
committed
Updated examples.
1 parent b7f8342 commit 175835a

File tree

10 files changed

+86
-43
lines changed

10 files changed

+86
-43
lines changed

package.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
{
22
"private": true,
33
"devDependencies": {
4-
"babel-core": "^5.8.22",
4+
"babel-core": "^5.8.25",
55
"babel-loader": "^5.3.2",
6-
"css-loader": "^0.16.0",
6+
"css-loader": "^0.19.0",
77
"extract-text-webpack-plugin": "^0.8.2",
8-
"style-loader": "^0.12.3",
9-
"webpack": "^1.12.0"
8+
"style-loader": "^0.12.4",
9+
"webpack": "^1.12.2"
1010
},
1111
"dependencies": {
12-
"react": "^0.14.0-beta3",
13-
"react-css-modules": "^3.0.1",
14-
"react-dom": "^0.14.0-beta3"
12+
"react": "^0.14.0-rc1",
13+
"react-css-modules": "^3.5.1",
14+
"react-dom": "^0.14.0-rc1"
1515
}
1616
}

src/UsingDecorator/car.css

Lines changed: 0 additions & 11 deletions
This file was deleted.

src/UsingDecorator/index.js

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,15 @@
11
import React from 'react';
2-
import styles from './car.css';
32
import CSSModules from 'react-css-modules';
3+
import styles from './../table.css';
44

55
@CSSModules(styles)
66
export default class extends React.Component {
77
render () {
8-
return <div styleName='car'>
9-
<div styleName='front-door'>front-door</div>
10-
<div styleName='back-door'>back-door</div>
8+
return <div styleName='table'>
9+
<div styleName='row'>
10+
<div styleName='cell'>A0</div>
11+
<div styleName='cell'>B0</div>
12+
</div>
1113
</div>;
1214
}
1315
}

src/UsingStyleName/car.css

Lines changed: 0 additions & 11 deletions
This file was deleted.

src/UsingStyleName/index.js

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,16 @@
11
import React from 'react';
2-
import styles from './car.css';
32
import CSSModules from 'react-css-modules';
3+
import styles from './../table.css';
44

5-
class Car extends React.Component {
5+
class Table extends React.Component {
66
render () {
7-
return <div styleName='car'>
8-
<div styleName='front-door'>front-door</div>
9-
<div styleName='back-door'>back-door</div>
7+
return <div styleName='table'>
8+
<div styleName='row'>
9+
<div styleName='cell'>A0</div>
10+
<div styleName='cell'>B0</div>
11+
</div>
1012
</div>;
1113
}
1214
}
1315

14-
export default CSSModules(Car, styles);
16+
export default CSSModules(Table, styles);

src/UsingStylesProperty/custom.css

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
.table {
2+
composes: table from './../table.css';
3+
}
4+
5+
.row {
6+
composes: row from './../table.css';
7+
}
8+
9+
/* .cell {
10+
composes: cell from './table.css';
11+
} */
12+
13+
.table {
14+
width: 400px;
15+
}
16+
17+
.cell {
18+
float: left; width: 154px; background: #eee; padding: 10px; margin: 10px 0 10px 10px;
19+
}

src/UsingStylesProperty/index.js

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
import React from 'react';
2+
import CSSModules from 'react-css-modules';
3+
import styles from './../table.css';
4+
5+
class Table extends React.Component {
6+
render () {
7+
return <div styleName='table'>
8+
<div styleName='row'>
9+
<div styleName='cell'>A0</div>
10+
<div styleName='cell'>B0</div>
11+
</div>
12+
</div>;
13+
}
14+
}
15+
16+
export default CSSModules(Table, styles);

src/index.js

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,15 @@
11
import React from 'react';
22
import ReactDOM from 'react-dom';
3-
import UsingstyleName from './UsingstyleName';
3+
4+
import UsingStyleName from './UsingStyleName';
5+
6+
import UsingStylesProperty from './UsingStylesProperty';
7+
import UsingStylesPropertyStyles from './UsingStylesProperty/custom.css';
8+
49
import UsingDecorator from './UsingDecorator';
510

611
ReactDOM.render(<div>
7-
<UsingstyleName />
12+
<UsingStyleName />
13+
<UsingStylesProperty styles={UsingStylesPropertyStyles} />
814
<UsingDecorator />
915
</div>, document.querySelector('#app'));

src/table.css

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
.table {
2+
width: 200px;
3+
}
4+
5+
.table,
6+
.row,
7+
.cell {
8+
margin: 10px; overflow: hidden;
9+
}
10+
11+
.table {
12+
border: 1px solid #000;
13+
}
14+
15+
.row {
16+
border: 1px solid #f00;
17+
}
18+
19+
.cell {
20+
border: 1px solid #00f; padding: 10px;
21+
}

webpack.config.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,7 @@ module.exports = {
5555
]
5656
},
5757
resolve: {
58-
// Required for development only.
59-
root: path.resolve(__dirname, 'node_modules'),
58+
// root: path.resolve(__dirname, 'node_modules'),
6059
extensions: [
6160
'',
6261
'.js'

0 commit comments

Comments
 (0)