Fix css bundles (#126)

ShokoAnime · Mar 3, 2018 · 703b968 · 703b968
1 parent e7db9fc
commit 703b968
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/css/main.scss b/css/main.scss
@@ -1,2 +1,2 @@
-@import "../css/bootstrap-reset.css";
-@import "../css/webui-main.css";
+@import "./bootstrap-reset.css";
+@import "./webui-main.css";
diff --git a/webpack.config.default.js b/webpack.config.default.js
@@ -17,8 +17,7 @@ const config = {
     '!!font-awesome-sass-loader!./font-awesome.config.js',
     'roboto-npm-webfont',
     'bootstrap-loader',
-    '!!style-loader!css-loader!./css/bootstrap-reset.css',
-    '!!style-loader!css-loader!./css/main.css',
+    './css/main.scss',
     './src/main.jsx',
   ],
   output: {
@@ -80,7 +79,7 @@ const config = {
       },
       {
         test: /\.css$/,
-        exclude: '/node_modules/',
+        exclude: ['/node_modules/', '/css/'],
         use: ExtractTextPlugin.extract({
           fallback: 'style-loader',
           use: [{