Merge pull request #3383 from Kdecherf/fix-webpack-and-login

Fix webpack and login screen

4 files changed, 18 insertions, 3 deletions

diff --git a/app/Resources/static/themes/_global/share.js b/app/Resources/static/themes/_global/share.js
index d7078616..15206b37 100644
--- a/app/Resources/static/themes/_global/share.js
+++ b/app/Resources/static/themes/_global/share.js
@@ -1 +1,4 @@
 import './share.scss';
+
+function requireAll(r) { r.keys().forEach(r); }
+requireAll(require.context('./img/', true, /\.(jpg|png|gif|svg|ico)$/));
diff --git a/app/Resources/static/themes/material/css/media_queries.scss b/app/Resources/static/themes/material/css/media_queries.scss
index 08c2d8ab..36d79a45 100644
--- a/app/Resources/static/themes/material/css/media_queries.scss
+++ b/app/Resources/static/themes/material/css/media_queries.scss
@@ -4,7 +4,7 @@
 
 @media only screen and (min-width: 992px) {
   nav,
-  body:not(.entry) main,
+  body:not(.entry):not(.login) main,
   footer {
     padding-left: 240px;
   }
diff --git a/app/config/webpack/dev.js b/app/config/webpack/dev.js
index b6551152..97abc5eb 100644
--- a/app/config/webpack/dev.js
+++ b/app/config/webpack/dev.js
@@ -52,7 +52,7 @@ module.exports = function () {
           ],
         },
         {
-          test: /\.(jpg|png|gif|svg|eot|ttf|woff|woff2)$/,
+          test: /\.(jpg|png|gif|svg|ico|eot|ttf|woff|woff2)$/,
           use: 'url-loader',
         },
       ],
diff --git a/app/config/webpack/prod.js b/app/config/webpack/prod.js
index 44961cc5..17b8c384 100644
--- a/app/config/webpack/prod.js
+++ b/app/config/webpack/prod.js
@@ -76,7 +76,8 @@ module.exports = function () {
           }),
         },
         {
-          test: /\.(jpg|png|gif|svg)$/,
+          test: /\.(jpg|png|gif|svg|ico)$/,
+          include: /node_modules/,
           use: {
             loader: 'file-loader',
             options: {
@@ -85,6 +86,17 @@ module.exports = function () {
           },
         },
         {
+          test: /\.(jpg|png|gif|svg|ico)$/,
+          exclude: /node_modules/,
+          use: {
+            loader: 'file-loader',
+            options: {
+              context: 'app/Resources/static',
+              name: '[path][name].[ext]',
+            },
+          },
+        },
+        {
           test: /\.(eot|ttf|woff|woff2)$/,
           use: {
             loader: 'file-loader',