aboutsummaryrefslogtreecommitdiffhomepage
path: root/app
diff options
context:
space:
mode:
Diffstat (limited to 'app')
-rw-r--r--app/Resources/static/themes/_global/share.js3
-rw-r--r--app/Resources/static/themes/material/css/media_queries.scss2
-rw-r--r--app/config/webpack/dev.js2
-rw-r--r--app/config/webpack/prod.js14
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 @@
1import './share.scss'; 1import './share.scss';
2
3function requireAll(r) { r.keys().forEach(r); }
4requireAll(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 @@
4 4
5@media only screen and (min-width: 992px) { 5@media only screen and (min-width: 992px) {
6 nav, 6 nav,
7 body:not(.entry) main, 7 body:not(.entry):not(.login) main,
8 footer { 8 footer {
9 padding-left: 240px; 9 padding-left: 240px;
10 } 10 }
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 () {
52 ], 52 ],
53 }, 53 },
54 { 54 {
55 test: /\.(jpg|png|gif|svg|eot|ttf|woff|woff2)$/, 55 test: /\.(jpg|png|gif|svg|ico|eot|ttf|woff|woff2)$/,
56 use: 'url-loader', 56 use: 'url-loader',
57 }, 57 },
58 ], 58 ],
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 () {
76 }), 76 }),
77 }, 77 },
78 { 78 {
79 test: /\.(jpg|png|gif|svg)$/, 79 test: /\.(jpg|png|gif|svg|ico)$/,
80 include: /node_modules/,
80 use: { 81 use: {
81 loader: 'file-loader', 82 loader: 'file-loader',
82 options: { 83 options: {
@@ -85,6 +86,17 @@ module.exports = function () {
85 }, 86 },
86 }, 87 },
87 { 88 {
89 test: /\.(jpg|png|gif|svg|ico)$/,
90 exclude: /node_modules/,
91 use: {
92 loader: 'file-loader',
93 options: {
94 context: 'app/Resources/static',
95 name: '[path][name].[ext]',
96 },
97 },
98 },
99 {
88 test: /\.(eot|ttf|woff|woff2)$/, 100 test: /\.(eot|ttf|woff|woff2)$/,
89 use: { 101 use: {
90 loader: 'file-loader', 102 loader: 'file-loader',