From 9c568239ec57dd57f3c58521873a26d42947f7ff Mon Sep 17 00:00:00 2001 From: ivaosthu Date: Tue, 20 Dec 2016 19:15:12 +0100 Subject: [PATCH] Do not load react-mdl.css from node_modules --- frontend/index.html | 1 - frontend/src/index.jsx | 3 +++ frontend/webpack.config.js | 6 +++++- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/frontend/index.html b/frontend/index.html index 4ab51d9e47..25970fa8af 100644 --- a/frontend/index.html +++ b/frontend/index.html @@ -3,7 +3,6 @@ Unleash Admin - diff --git a/frontend/src/index.jsx b/frontend/src/index.jsx index 4d14854bc9..7544329930 100644 --- a/frontend/src/index.jsx +++ b/frontend/src/index.jsx @@ -1,4 +1,7 @@ +import 'react-mdl/extra/material.css'; +import 'react-mdl/extra/material.js'; import 'whatwg-fetch'; + import React from 'react'; import ReactDOM from 'react-dom'; import { Router, Route, IndexRedirect, hashHistory } from 'react-router'; diff --git a/frontend/webpack.config.js b/frontend/webpack.config.js index 8ed0f05231..1ec6a9fd0b 100644 --- a/frontend/webpack.config.js +++ b/frontend/webpack.config.js @@ -44,10 +44,14 @@ module.exports = { include: path.join(__dirname, 'src'), }, { - test: /(\.scss|\.css)$/, + test: /(\.scss)$/, loader: ExtractTextPlugin.extract('style', 'css?sourceMap&modules&importLoaders=1&localIdentName=[name]__[local]___[hash:base64:5]!postcss!sass'), }, + { + test: /\.css$/, + loader: 'style-loader!css-loader', + }, ], },