diff --git a/react/src/styles/index.scss b/react/src/styles/index.scss index 34f7b71..7eceb0c 100644 --- a/react/src/styles/index.scss +++ b/react/src/styles/index.scss @@ -1,7 +1,3 @@ -@import '../components/addcoin/addcoin.scss'; -@import '../components/dashboard/dashboard.scss'; -@import '../components/login/login.scss'; - @import '../assets/global/css/bootstrap.min.css'; @import '../assets/global/css/bootstrap-extend.min.css'; @import '../assets/global/css/alertify.css'; @@ -34,6 +30,9 @@ @import '../assets/global/fonts/brand-icons/brand-icons.min.css'; @import '../assets/skins/orange.min.css'; @import '../../node_modules/rc-tree/assets/index.css'; +@import '../components/addcoin/addcoin.scss'; +@import '../components/dashboard/dashboard.scss'; +@import '../components/login/login.scss'; #app > div { height: 100%; diff --git a/react/webpack.config.js b/react/webpack.config.js index ca28b7f..245c7e4 100644 --- a/react/webpack.config.js +++ b/react/webpack.config.js @@ -122,7 +122,14 @@ if (isProduction) { test: /\.scss$/, loader: ExtractTextPlugin.extract({ fallback: 'style-loader', - use: 'css-loader!postcss-loader!sass-loader!file-loader!url-loader', + use: [ + 'style-loader', + 'css-loader', + 'postcss-loader', + 'sass-loader' + //'file-loader', + //'url-loader' + ] }), } );