Skip to content

Commit 43ea198

Browse files
committed
Add logo
1 parent 9d61bfa commit 43ea198

File tree

7 files changed

+61
-5
lines changed

7 files changed

+61
-5
lines changed

package.json

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,16 +21,18 @@
2121
"autoprefixer-core": "^5.1.11",
2222
"babel-core": "^5.2.17",
2323
"babel-loader": "^5.0.0",
24-
"css-loader": "^0.14.3",
24+
"css-loader": "^0.14.4",
2525
"ejs": "^2.3.1",
2626
"extract-text-webpack-plugin": "^0.8.1",
27+
"file-loader": "^0.8.4",
2728
"node-libs-browser": "^0.5.0",
2829
"postcss-color-rebeccapurple": "^1.1.0",
2930
"postcss-loader": "^0.4.3",
3031
"react": "^0.13.3",
3132
"react-to-html-webpack-plugin": "^2.1.0",
32-
"style-loader": "^0.12.2",
33+
"style-loader": "^0.12.3",
34+
"url-loader": "^0.5.6",
3335
"webpack": "^1.9.10",
34-
"webpack-dev-server": "^1.8.2"
36+
"webpack-dev-server": "^1.9.0"
3537
}
3638
}

src/components/App.css

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
.app {
2+
font-family: helvetica, arial, sans-serif;
3+
padding: 6px 20px 30px;
4+
}

src/components/App.js

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
1+
import styles from './App.css';
2+
13
import React, { Component } from 'react';
24

5+
import Logo from './Logo/Logo';
36
import ScopedSelectors from './ScopedSelectors/ScopedSelectors';
47
import GlobalSelectors from './GlobalSelectors/GlobalSelectors';
58
import ClassInheritance from './ClassInheritance/ClassInheritance';
@@ -10,7 +13,8 @@ export default class App extends Component {
1013

1114
render() {
1215
return (
13-
<div>
16+
<div className={styles.app}>
17+
<Logo />
1418
<h1>CSS Modules Webpack Demo</h1>
1519

1620
<h2>Scoped Selectors</h2>

src/components/Logo/Logo.css

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
.logo {
2+
background: url('./logo.svg');
3+
background-size: 200px 200px;
4+
width: 200px;
5+
height: 200px;
6+
}

src/components/Logo/Logo.js

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
import styles from './Logo.css';
2+
3+
import React, { Component } from 'react';
4+
5+
export default class Logo extends Component {
6+
7+
render() {
8+
return <div className={styles.logo} />;
9+
}
10+
11+
};

src/components/Logo/logo.svg

Lines changed: 28 additions & 0 deletions
Loading

webpack.config.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@ module.exports = {
1818
module: {
1919
loaders: [
2020
{ test: /\.js$/, loader: 'babel-loader', exclude: /node_modules/ },
21-
{ test: /\.css$/, loader: ExtractTextPlugin.extract('style-loader', 'css-loader?module&importLoaders=1&localIdentName=[name]__[local]___[hash:base64:5]!postcss-loader') }
21+
{ test: /\.css$/, loader: ExtractTextPlugin.extract('style-loader', 'css-loader?module&importLoaders=1&localIdentName=[name]__[local]___[hash:base64:5]!postcss-loader') },
22+
{ test: /\.svg$/, loader: "url-loader?limit=10000&mimetype=image/svg+xml" }
2223
]
2324
},
2425

0 commit comments

Comments
 (0)