diff options
| -rw-r--r-- | base.scss | 13 | ||||
| -rw-r--r-- | package.json | 3 | ||||
| -rw-r--r-- | webpack.config.js | 24 |
3 files changed, 29 insertions, 11 deletions
diff --git a/base.scss b/base.scss new file mode 100644 index 0000000..d94bb3f --- /dev/null +++ b/base.scss @@ -0,0 +1,13 @@ +* { + padding: 0; + margin: 0; +} + +div#root { + canvas#qr { + display: block; + } + input { + display: block; + } +}
\ No newline at end of file diff --git a/package.json b/package.json index d71cf5a..1a62b73 100644 --- a/package.json +++ b/package.json @@ -12,8 +12,11 @@ "babel-preset-es2015": "^6.9.0", "babel-preset-react": "^6.5.0", "css-loader": "^0.23.1", + "node-bourbon": "^4.2.8", + "node-sass": "^3.8.0", "react": "^15.1.0", "react-dom": "^15.1.0", + "sass-loader": "^4.0.0", "style-loader": "^0.13.1", "webpack": "^1.13.1", "webpack-dev-server": "^1.14.1" diff --git a/webpack.config.js b/webpack.config.js index 5d1e488..c52f805 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -1,13 +1,15 @@ +var bourbon = require('node-bourbon').includePaths + module.exports = { - entry: './index.js', - output: { - path: __dirname, - filename: 'bundle.js' - }, - module: { - loaders: [ - { test: /\.js$/, loader: 'babel', }, - { test: /\.css$/, loader: 'style!css' } - ] - } + entry: './index.js', + output: { + path: __dirname, + filename: 'bundle.js' + }, + module: { + loaders: [ + { test: /\.js$/, loader: 'babel', }, + { test: /\.scss$/, loader: 'style!css!sass?includePaths[]=' + bourbon } + ] + } }; |