diff --git a/app/Resources/static/themes/_global/img/bg-select.png b/app/Resources/static/themes/_global/img/bg-select.png
index 951204412..9bdc8a214 100644
Binary files a/app/Resources/static/themes/_global/img/bg-select.png and b/app/Resources/static/themes/_global/img/bg-select.png differ
diff --git a/app/Resources/static/themes/_global/img/icons/Diaspora-asterisk.svg b/app/Resources/static/themes/_global/img/icons/Diaspora-asterisk.svg
index 91764b605..bd8fcecb3 100644
--- a/app/Resources/static/themes/_global/img/icons/Diaspora-asterisk.svg
+++ b/app/Resources/static/themes/_global/img/icons/Diaspora-asterisk.svg
@@ -1,67 +1,4 @@
-
-
-
-
+AIxGAAEAAEYjgAAAAKMRQAAAgNEIIAAAwGj+P10o1H/ia8mRAAAAAElFTkSuQmCC" y="101.6479"/>
\ No newline at end of file
diff --git a/app/Resources/static/themes/_global/img/icons/carrot-icon--black.png b/app/Resources/static/themes/_global/img/icons/carrot-icon--black.png
index 6da7925b5..3a5ef1d3a 100644
Binary files a/app/Resources/static/themes/_global/img/icons/carrot-icon--black.png and b/app/Resources/static/themes/_global/img/icons/carrot-icon--black.png differ
diff --git a/app/Resources/static/themes/_global/img/icons/carrot-icon--white.png b/app/Resources/static/themes/_global/img/icons/carrot-icon--white.png
index a70044b6f..48bcd68a9 100644
Binary files a/app/Resources/static/themes/_global/img/icons/carrot-icon--white.png and b/app/Resources/static/themes/_global/img/icons/carrot-icon--white.png differ
diff --git a/app/Resources/static/themes/_global/img/icons/diaspora-icon--black.png b/app/Resources/static/themes/_global/img/icons/diaspora-icon--black.png
index 32bca1947..c48a832a9 100644
Binary files a/app/Resources/static/themes/_global/img/icons/diaspora-icon--black.png and b/app/Resources/static/themes/_global/img/icons/diaspora-icon--black.png differ
diff --git a/app/Resources/static/themes/_global/img/icons/diaspora-icon--white.png b/app/Resources/static/themes/_global/img/icons/diaspora-icon--white.png
index fc48d47c4..52df6bd3e 100644
Binary files a/app/Resources/static/themes/_global/img/icons/diaspora-icon--white.png and b/app/Resources/static/themes/_global/img/icons/diaspora-icon--white.png differ
diff --git a/app/Resources/static/themes/_global/img/icons/scuttle.png b/app/Resources/static/themes/_global/img/icons/scuttle.png
index 3b8eb2645..24aabfbd7 100644
Binary files a/app/Resources/static/themes/_global/img/icons/scuttle.png and b/app/Resources/static/themes/_global/img/icons/scuttle.png differ
diff --git a/app/Resources/static/themes/_global/img/icons/shaarli.png b/app/Resources/static/themes/_global/img/icons/shaarli.png
index 0e83c46ee..1921c5303 100644
Binary files a/app/Resources/static/themes/_global/img/icons/shaarli.png and b/app/Resources/static/themes/_global/img/icons/shaarli.png differ
diff --git a/app/Resources/static/themes/_global/img/icons/unmark-icon--black.png b/app/Resources/static/themes/_global/img/icons/unmark-icon--black.png
index 45f679eec..6d0efc5b2 100644
Binary files a/app/Resources/static/themes/_global/img/icons/unmark-icon--black.png and b/app/Resources/static/themes/_global/img/icons/unmark-icon--black.png differ
diff --git a/app/Resources/static/themes/_global/img/list.png b/app/Resources/static/themes/_global/img/list.png
index bd5aff5ae..3ee98c212 100755
Binary files a/app/Resources/static/themes/_global/img/list.png and b/app/Resources/static/themes/_global/img/list.png differ
diff --git a/app/Resources/static/themes/_global/img/table.png b/app/Resources/static/themes/_global/img/table.png
index 859c4cd8f..24e7b6fa2 100755
Binary files a/app/Resources/static/themes/_global/img/table.png and b/app/Resources/static/themes/_global/img/table.png differ
diff --git a/app/Resources/static/themes/baggy/img/blank.png b/app/Resources/static/themes/baggy/img/blank.png
index 63e09844e..113f5d56e 100755
Binary files a/app/Resources/static/themes/baggy/img/blank.png and b/app/Resources/static/themes/baggy/img/blank.png differ
diff --git a/app/Resources/static/themes/baggy/img/down.png b/app/Resources/static/themes/baggy/img/down.png
index b9d536a7c..d048e4cbc 100644
Binary files a/app/Resources/static/themes/baggy/img/down.png and b/app/Resources/static/themes/baggy/img/down.png differ
diff --git a/app/Resources/static/themes/baggy/img/list.png b/app/Resources/static/themes/baggy/img/list.png
index bd5aff5ae..3ee98c212 100755
Binary files a/app/Resources/static/themes/baggy/img/list.png and b/app/Resources/static/themes/baggy/img/list.png differ
diff --git a/app/Resources/static/themes/baggy/img/table.png b/app/Resources/static/themes/baggy/img/table.png
index 859c4cd8f..24e7b6fa2 100755
Binary files a/app/Resources/static/themes/baggy/img/table.png and b/app/Resources/static/themes/baggy/img/table.png differ
diff --git a/app/Resources/static/themes/baggy/img/top.png b/app/Resources/static/themes/baggy/img/top.png
index 954a8c0ac..782acc095 100644
Binary files a/app/Resources/static/themes/baggy/img/top.png and b/app/Resources/static/themes/baggy/img/top.png differ
diff --git a/app/config/webpack/prod.js b/app/config/webpack/prod.js
index 8ed77fac8..d860f81cb 100644
--- a/app/config/webpack/prod.js
+++ b/app/config/webpack/prod.js
@@ -76,31 +76,26 @@ module.exports = merge(commonConfig, {
{
test: /\.(jpg|png|gif|svg|ico)$/,
include: /node_modules/,
- use: {
- loader: 'file-loader',
- options: {
- name: 'img/[name].[ext]',
- },
+ type: 'asset/resource',
+ generator: {
+ filename: 'img/[name][ext]'
},
},
{
test: /\.(jpg|png|gif|svg|ico)$/,
exclude: /node_modules/,
- use: {
- loader: 'file-loader',
- options: {
- context: 'app/Resources/static',
- name: '[path][name].[ext]',
- },
- },
+ type: 'asset/resource',
+ generator: {
+ filename: content => {
+ return content.filename.replace('app/Resources/static/', '')
+ }
+ }
},
{
test: /\.(eot|ttf|woff|woff2)$/,
- use: {
- loader: 'file-loader',
- options: {
- name: 'fonts/[name].[ext]',
- },
+ type: 'asset/resource',
+ generator: {
+ filename: 'fonts/[name][ext]'
},
},
],
diff --git a/package.json b/package.json
index 0ad894292..b96a38186 100644
--- a/package.json
+++ b/package.json
@@ -41,7 +41,7 @@
"@babel/preset-env": "^7.14.4",
"autoprefixer": "^10.4.1",
"babel-loader": "^8.2.3",
- "css-loader": "^5.2.6",
+ "css-loader": "^6.5.1",
"eslint": "^7.27.0",
"eslint-config-airbnb-base": "^14.2.1",
"eslint-plugin-import": "^2.25.4",
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/screenshot.jpg b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/screenshot.jpg
index 19cd24bb3..1aa8f1461 100755
Binary files a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/screenshot.jpg and b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/screenshot.jpg differ
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/screenshot.jpg b/src/Wallabag/CoreBundle/Resources/views/themes/material/screenshot.jpg
index 6649719d8..b640b7dad 100755
Binary files a/src/Wallabag/CoreBundle/Resources/views/themes/material/screenshot.jpg and b/src/Wallabag/CoreBundle/Resources/views/themes/material/screenshot.jpg differ
diff --git a/tests/Wallabag/CoreBundle/fixtures/image-no-content-type.jpg b/tests/Wallabag/CoreBundle/fixtures/image-no-content-type.jpg
index 0c60e952c..e1bd41927 100644
Binary files a/tests/Wallabag/CoreBundle/fixtures/image-no-content-type.jpg and b/tests/Wallabag/CoreBundle/fixtures/image-no-content-type.jpg differ
diff --git a/tests/Wallabag/CoreBundle/fixtures/unnamed.png b/tests/Wallabag/CoreBundle/fixtures/unnamed.png
index e6dd9caad..d278dff40 100644
Binary files a/tests/Wallabag/CoreBundle/fixtures/unnamed.png and b/tests/Wallabag/CoreBundle/fixtures/unnamed.png differ
diff --git a/tests/Wallabag/ImportBundle/fixtures/unnamed.png b/tests/Wallabag/ImportBundle/fixtures/unnamed.png
index e6dd9caad..d278dff40 100644
Binary files a/tests/Wallabag/ImportBundle/fixtures/unnamed.png and b/tests/Wallabag/ImportBundle/fixtures/unnamed.png differ
diff --git a/web/img/appicon/apple-touch-icon-114.png b/web/img/appicon/apple-touch-icon-114.png
index 0e96edd5c..4328e7eb2 100755
Binary files a/web/img/appicon/apple-touch-icon-114.png and b/web/img/appicon/apple-touch-icon-114.png differ
diff --git a/web/img/appicon/apple-touch-icon-120.png b/web/img/appicon/apple-touch-icon-120.png
index dc5aab1c4..3288ebb57 100755
Binary files a/web/img/appicon/apple-touch-icon-120.png and b/web/img/appicon/apple-touch-icon-120.png differ
diff --git a/web/img/appicon/apple-touch-icon-144.png b/web/img/appicon/apple-touch-icon-144.png
index 1d005db6f..0a2a71e4f 100755
Binary files a/web/img/appicon/apple-touch-icon-144.png and b/web/img/appicon/apple-touch-icon-144.png differ
diff --git a/web/img/appicon/apple-touch-icon-152.png b/web/img/appicon/apple-touch-icon-152.png
index f915231fa..7709ba533 100755
Binary files a/web/img/appicon/apple-touch-icon-152.png and b/web/img/appicon/apple-touch-icon-152.png differ
diff --git a/web/img/appicon/apple-touch-icon-512.png b/web/img/appicon/apple-touch-icon-512.png
index 7385c2560..ac1623c4d 100644
Binary files a/web/img/appicon/apple-touch-icon-512.png and b/web/img/appicon/apple-touch-icon-512.png differ
diff --git a/web/img/appicon/apple-touch-icon-57.png b/web/img/appicon/apple-touch-icon-57.png
index 5aa19ed96..fdb177b02 100755
Binary files a/web/img/appicon/apple-touch-icon-57.png and b/web/img/appicon/apple-touch-icon-57.png differ
diff --git a/web/img/appicon/apple-touch-icon-72.png b/web/img/appicon/apple-touch-icon-72.png
index b8b48e1bc..bfa41e92d 100755
Binary files a/web/img/appicon/apple-touch-icon-72.png and b/web/img/appicon/apple-touch-icon-72.png differ
diff --git a/web/img/appicon/apple-touch-icon-76.png b/web/img/appicon/apple-touch-icon-76.png
index 9f9dba27e..46f516f93 100755
Binary files a/web/img/appicon/apple-touch-icon-76.png and b/web/img/appicon/apple-touch-icon-76.png differ
diff --git a/web/img/appicon/apple-touch-icon.png b/web/img/appicon/apple-touch-icon.png
index 9cf29e2b4..fdb177b02 100755
Binary files a/web/img/appicon/apple-touch-icon.png and b/web/img/appicon/apple-touch-icon.png differ
diff --git a/web/img/logo-w.png b/web/img/logo-w.png
index 65dc607b7..2bdc03b6c 100755
Binary files a/web/img/logo-w.png and b/web/img/logo-w.png differ
diff --git a/web/img/logo-wallabag.svg b/web/img/logo-wallabag.svg
index f76907a25..d573359ae 100644
--- a/web/img/logo-wallabag.svg
+++ b/web/img/logo-wallabag.svg
@@ -1 +1 @@
-
+
\ No newline at end of file
diff --git a/web/wallassets/themes/_global/img/bg-select.png b/web/wallassets/themes/_global/img/bg-select.png
index 951204412..9bdc8a214 100644
Binary files a/web/wallassets/themes/_global/img/bg-select.png and b/web/wallassets/themes/_global/img/bg-select.png differ
diff --git a/web/wallassets/themes/_global/img/icons/Diaspora-asterisk.svg b/web/wallassets/themes/_global/img/icons/Diaspora-asterisk.svg
index 91764b605..bd8fcecb3 100644
--- a/web/wallassets/themes/_global/img/icons/Diaspora-asterisk.svg
+++ b/web/wallassets/themes/_global/img/icons/Diaspora-asterisk.svg
@@ -1,67 +1,4 @@
-
-
-
-
+AIxGAAEAAEYjgAAAAKMRQAAAgNEIIAAAwGj+P10o1H/ia8mRAAAAAElFTkSuQmCC" y="101.6479"/>
\ No newline at end of file
diff --git a/web/wallassets/themes/_global/img/icons/carrot-icon--black.png b/web/wallassets/themes/_global/img/icons/carrot-icon--black.png
index 6da7925b5..3a5ef1d3a 100644
Binary files a/web/wallassets/themes/_global/img/icons/carrot-icon--black.png and b/web/wallassets/themes/_global/img/icons/carrot-icon--black.png differ
diff --git a/web/wallassets/themes/_global/img/icons/carrot-icon--white.png b/web/wallassets/themes/_global/img/icons/carrot-icon--white.png
index a70044b6f..48bcd68a9 100644
Binary files a/web/wallassets/themes/_global/img/icons/carrot-icon--white.png and b/web/wallassets/themes/_global/img/icons/carrot-icon--white.png differ
diff --git a/web/wallassets/themes/_global/img/icons/diaspora-icon--black.png b/web/wallassets/themes/_global/img/icons/diaspora-icon--black.png
index 32bca1947..c48a832a9 100644
Binary files a/web/wallassets/themes/_global/img/icons/diaspora-icon--black.png and b/web/wallassets/themes/_global/img/icons/diaspora-icon--black.png differ
diff --git a/web/wallassets/themes/_global/img/icons/scuttle.png b/web/wallassets/themes/_global/img/icons/scuttle.png
index 3b8eb2645..24aabfbd7 100644
Binary files a/web/wallassets/themes/_global/img/icons/scuttle.png and b/web/wallassets/themes/_global/img/icons/scuttle.png differ
diff --git a/web/wallassets/themes/_global/img/icons/shaarli.png b/web/wallassets/themes/_global/img/icons/shaarli.png
index 0e83c46ee..1921c5303 100644
Binary files a/web/wallassets/themes/_global/img/icons/shaarli.png and b/web/wallassets/themes/_global/img/icons/shaarli.png differ
diff --git a/web/wallassets/themes/_global/img/icons/unmark-icon--black.png b/web/wallassets/themes/_global/img/icons/unmark-icon--black.png
index 45f679eec..6d0efc5b2 100644
Binary files a/web/wallassets/themes/_global/img/icons/unmark-icon--black.png and b/web/wallassets/themes/_global/img/icons/unmark-icon--black.png differ
diff --git a/web/wallassets/themes/_global/img/list.png b/web/wallassets/themes/_global/img/list.png
index bd5aff5ae..3ee98c212 100644
Binary files a/web/wallassets/themes/_global/img/list.png and b/web/wallassets/themes/_global/img/list.png differ
diff --git a/web/wallassets/themes/_global/img/table.png b/web/wallassets/themes/_global/img/table.png
index 859c4cd8f..24e7b6fa2 100644
Binary files a/web/wallassets/themes/_global/img/table.png and b/web/wallassets/themes/_global/img/table.png differ
diff --git a/yarn.lock b/yarn.lock
index 18080e2b3..420ba9de3 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2171,20 +2171,18 @@ cross-spawn@^7.0.2, cross-spawn@^7.0.3:
shebang-command "^2.0.0"
which "^2.0.1"
-css-loader@^5.2.6:
- version "5.2.7"
- resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-5.2.7.tgz#9b9f111edf6fb2be5dc62525644cbc9c232064ae"
- integrity sha512-Q7mOvpBNBG7YrVGMxRxcBJZFL75o+cH2abNASdibkj/fffYD8qWbInZrD0S9ccI6vZclF3DsHE7njGlLtaHbhg==
+css-loader@^6.5.1:
+ version "6.5.1"
+ resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-6.5.1.tgz#0c43d4fbe0d97f699c91e9818cb585759091d1b1"
+ integrity sha512-gEy2w9AnJNnD9Kuo4XAP9VflW/ujKoS9c/syO+uWMlm5igc7LysKzPXaDoR2vroROkSwsTS2tGr1yGGEbZOYZQ==
dependencies:
icss-utils "^5.1.0"
- loader-utils "^2.0.0"
postcss "^8.2.15"
postcss-modules-extract-imports "^3.0.0"
postcss-modules-local-by-default "^4.0.0"
postcss-modules-scope "^3.0.0"
postcss-modules-values "^4.0.0"
postcss-value-parser "^4.1.0"
- schema-utils "^3.0.0"
semver "^7.3.5"
cssesc@^3.0.0: