Commit 1072445

committed

fix: import base styles and add to css-hot-loader. resolves #41.

1 parent fdfd34d commit 1072445Copy full SHA for 1072445

File tree

-11

lines changed

-11

lines changed

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`import 'babel-polyfill';`
	`2`	`+import 'css/base/index.scss';`
`2`	`3`	`import React from 'react';`
`3`	`4`	`import ReactDOM from 'react-dom';`
`4`	`5`	`import { Provider } from 'react-redux';`

Lines changed: 5 additions & 9 deletions

Original file line number	Diff line number	Diff 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`	`+ */`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -97,7 +97,7 @@ export default {`
`97`	`97`	`path.resolve(__dirname, '../node_modules'),`
`98`	`98`	`path.resolve(__dirname, '../common/css/base')`
`99`	`99`	`],`
`100`		`- use: extractTextPlugin.extract({`
	`100`	`+ use: ['css-hot-loader'].concat(extractTextPlugin.extract({`
`101`	`101`	`fallback: 'style-loader',`
`102`	`102`	`use: [`
`103`	`103`	`{ loader: 'postcss-loader' },`
`@@ -109,7 +109,7 @@ export default {`
`109`	`109`	`}`
`110`	`110`	`}`
`111`	`111`	`]`
`112`		`- })`
	`112`	`+ }))`
`113`	`113`	`},`
`114`	`114`	`{`
`115`	`115`	`test: /\.css$/,`

Comments

(0)