Fix custom css and js

dmitriid · Jul 11, 2019 · df1fd39 · df1fd39
1 parent a6023da
commit df1fd39
Show file tree

Hide file tree

Showing 6 changed files with 135 additions and 3 deletions.
diff --git a/assets/package-lock.json b/assets/package-lock.json
diff --git a/assets/package.json b/assets/package.json
@@ -18,6 +18,7 @@
     "babel-loader": "^8.0.0",
     "copy-webpack-plugin": "^4.5.0",
     "css-loader": "^2.1.1",
+    "style-loader": "^0.23.1",
     "mini-css-extract-plugin": "^0.4.0",
     "optimize-css-assets-webpack-plugin": "^4.0.0",
     "uglifyjs-webpack-plugin": "^1.2.4",

diff --git a/assets/static/js/clricons.min.js b/assets/static/js/clricons.min.js
diff --git a/assets/static/js/customelements.min.js b/assets/static/js/customelements.min.js
diff --git a/assets/webpack.config.js b/assets/webpack.config.js
@@ -30,12 +30,14 @@ module.exports = (env, options) => ({
       },
       {
         test: /\.css$/,
-        use: [MiniCssExtractPlugin.loader, 'css-loader']
+        use: ['style-loader', MiniCssExtractPlugin.loader, 'css-loader']
       }
     ]
   },
   plugins: [
     new MiniCssExtractPlugin({ filename: '../css/app.css' }),
+    new MiniCssExtractPlugin({filename: '../css/clr-ui.min.css'}),
+    new MiniCssExtractPlugin({filename: '../css/clr-icons.min.css'}),
     new CopyWebpackPlugin([{ from: 'static/', to: '../' }])
   ]
 });
diff --git a/lib/phreak_web/templates/layout/app.html.eex b/lib/phreak_web/templates/layout/app.html.eex
@@ -16,7 +16,7 @@
         </div>
     </main>
     <script type="text/javascript" src="<%= Routes.static_path(@conn, "/js/app.js") %>"></script>
-    <script type="text/javascript" src="<%= Routes.static_path(@conn, "/customelements.min.js") %>"></script>
-    <script type="text/javascript" src="<%= Routes.static_path(@conn, "/clricons.min.js") %>"></script>
+    <script type="text/javascript" src="<%= Routes.static_path(@conn, "/js/customelements.min.js") %>"></script>
+    <script type="text/javascript" src="<%= Routes.static_path(@conn, "/js/clricons.min.js") %>"></script>
   </body>
 </html>