Skip to content

Commit 1072445

Browse files
committed
fix: import base styles and add to css-hot-loader. resolves #41.
1 parent fdfd34d commit 1072445

File tree

3 files changed

+8
-11
lines changed

3 files changed

+8
-11
lines changed

client/index.js

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import 'babel-polyfill';
2+
import 'css/base/index.scss';
23
import React from 'react';
34
import ReactDOM from 'react-dom';
45
import { Provider } from 'react-redux';

common/css/base/_vendors.scss

+5-9
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
1-
// Import bootstrap-sass as needed
2-
$bootstrap-sass-asset-helper: true;
3-
@import "~bootstrap-sass/assets/stylesheets/bootstrap/variables";
4-
5-
$screen-lg-min: $app-max-width !global;
6-
$container-lg: $app-max-width !global;
7-
8-
@import "~bootstrap-sass/assets/stylesheets/bootstrap/mixins";
9-
@import "~bootstrap-sass/assets/stylesheets/bootstrap/grid";
1+
/* Import vendor styles as needed, for example:
2+
*
3+
* $bootstrap-sass-asset-helper: true;
4+
* @import "~bootstrap-sass/assets/stylesheets/bootstrap/variables";
5+
*/

webpack/base.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ export default {
9797
path.resolve(__dirname, '../node_modules'),
9898
path.resolve(__dirname, '../common/css/base')
9999
],
100-
use: extractTextPlugin.extract({
100+
use: ['css-hot-loader'].concat(extractTextPlugin.extract({
101101
fallback: 'style-loader',
102102
use: [
103103
{ loader: 'postcss-loader' },
@@ -109,7 +109,7 @@ export default {
109109
}
110110
}
111111
]
112-
})
112+
}))
113113
},
114114
{
115115
test: /\.css$/,

0 commit comments

Comments
 (0)