diff --git a/.gitignore b/.gitignore index 0f2969783..3199ac4f5 100644 --- a/.gitignore +++ b/.gitignore @@ -48,7 +48,6 @@ data/db/wallabag*.sqlite # assets stuff node_modules/ bin -app/Resources/build/ package-lock.json # Test-generated files diff --git a/app/Resources/static/themes/_global/img/bg-select.png b/app/Resources/static/themes/_global/img/bg-select.png deleted file mode 100644 index 9bdc8a214..000000000 Binary files a/app/Resources/static/themes/_global/img/bg-select.png and /dev/null 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 deleted file mode 100644 index bd8fcecb3..000000000 --- a/app/Resources/static/themes/_global/img/icons/Diaspora-asterisk.svg +++ /dev/null @@ -1,261 +0,0 @@ - \ No newline at end of file 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 deleted file mode 100644 index 52df6bd3e..000000000 Binary files a/app/Resources/static/themes/_global/img/icons/diaspora-icon--white.png and /dev/null differ diff --git a/app/Resources/static/themes/_global/img/list.png b/app/Resources/static/themes/_global/img/list.png deleted file mode 100755 index 3ee98c212..000000000 Binary files a/app/Resources/static/themes/_global/img/list.png and /dev/null differ diff --git a/app/Resources/static/themes/_global/img/table.png b/app/Resources/static/themes/_global/img/table.png deleted file mode 100755 index 24e7b6fa2..000000000 Binary files a/app/Resources/static/themes/_global/img/table.png and /dev/null differ diff --git a/app/config/webpack/common.js b/app/config/webpack/common.js index 4eca0e39d..bd4f3845d 100644 --- a/app/config/webpack/common.js +++ b/app/config/webpack/common.js @@ -6,8 +6,8 @@ const projectDir = path.resolve(__dirname, '../../../'); module.exports = { entry: { - material: path.join(projectDir, './app/Resources/static/themes/material/index.js'), - public: path.join(projectDir, './app/Resources/static/themes/_global/share.js'), + material: path.join(projectDir, './assets/material/index.js'), + public: path.join(projectDir, './assets/_global/share.js'), }, output: { filename: '[name].js', @@ -25,7 +25,7 @@ module.exports = { configFile: 'stylelint.config.js', failOnError: false, quiet: false, - context: 'app/Resources/static/themes', + context: 'assets', files: '**/*.scss', }), ], diff --git a/app/config/webpack/prod.js b/app/config/webpack/prod.js index 458a0190c..021cfacda 100644 --- a/app/config/webpack/prod.js +++ b/app/config/webpack/prod.js @@ -85,9 +85,6 @@ module.exports = merge(commonConfig, { test: /\.(jpg|png|gif|svg|ico)$/, exclude: /node_modules/, type: 'asset/resource', - generator: { - filename: (content) => content.filename.replace('app/Resources/static/', ''), - }, }, { test: /\.(eot|ttf|woff|woff2)$/, diff --git a/app/Resources/static/themes/_global/global.scss b/assets/_global/global.scss similarity index 100% rename from app/Resources/static/themes/_global/global.scss rename to assets/_global/global.scss diff --git a/app/Resources/static/themes/_global/img/icons/diaspora-icon--black.png b/assets/_global/img/icons/diaspora-icon--black.png similarity index 100% rename from app/Resources/static/themes/_global/img/icons/diaspora-icon--black.png rename to assets/_global/img/icons/diaspora-icon--black.png diff --git a/app/Resources/static/themes/_global/img/icons/scuttle.png b/assets/_global/img/icons/scuttle.png similarity index 100% rename from app/Resources/static/themes/_global/img/icons/scuttle.png rename to assets/_global/img/icons/scuttle.png diff --git a/app/Resources/static/themes/_global/img/icons/shaarli.png b/assets/_global/img/icons/shaarli.png similarity index 100% rename from app/Resources/static/themes/_global/img/icons/shaarli.png rename to assets/_global/img/icons/shaarli.png diff --git a/app/Resources/static/themes/_global/img/icons/unmark-icon--black.png b/assets/_global/img/icons/unmark-icon--black.png similarity index 100% rename from app/Resources/static/themes/_global/img/icons/unmark-icon--black.png rename to assets/_global/img/icons/unmark-icon--black.png diff --git a/app/Resources/static/themes/_global/index.js b/assets/_global/index.js similarity index 100% rename from app/Resources/static/themes/_global/index.js rename to assets/_global/index.js diff --git a/app/Resources/static/themes/_global/js/bookmarklet.js b/assets/_global/js/bookmarklet.js similarity index 100% rename from app/Resources/static/themes/_global/js/bookmarklet.js rename to assets/_global/js/bookmarklet.js diff --git a/app/Resources/static/themes/_global/js/highlight.js b/assets/_global/js/highlight.js similarity index 100% rename from app/Resources/static/themes/_global/js/highlight.js rename to assets/_global/js/highlight.js diff --git a/app/Resources/static/themes/_global/js/shortcuts/entry.js b/assets/_global/js/shortcuts/entry.js similarity index 100% rename from app/Resources/static/themes/_global/js/shortcuts/entry.js rename to assets/_global/js/shortcuts/entry.js diff --git a/app/Resources/static/themes/_global/js/shortcuts/main.js b/assets/_global/js/shortcuts/main.js similarity index 100% rename from app/Resources/static/themes/_global/js/shortcuts/main.js rename to assets/_global/js/shortcuts/main.js diff --git a/app/Resources/static/themes/_global/js/tools.js b/assets/_global/js/tools.js similarity index 100% rename from app/Resources/static/themes/_global/js/tools.js rename to assets/_global/js/tools.js diff --git a/app/Resources/static/themes/_global/share.js b/assets/_global/share.js similarity index 100% rename from app/Resources/static/themes/_global/share.js rename to assets/_global/share.js diff --git a/app/Resources/static/themes/_global/share.scss b/assets/_global/share.scss similarity index 100% rename from app/Resources/static/themes/_global/share.scss rename to assets/_global/share.scss diff --git a/app/Resources/static/themes/material/css/article.scss b/assets/material/css/article.scss similarity index 100% rename from app/Resources/static/themes/material/css/article.scss rename to assets/material/css/article.scss diff --git a/app/Resources/static/themes/material/css/cards.scss b/assets/material/css/cards.scss similarity index 100% rename from app/Resources/static/themes/material/css/cards.scss rename to assets/material/css/cards.scss diff --git a/app/Resources/static/themes/material/css/dark_theme.scss b/assets/material/css/dark_theme.scss similarity index 100% rename from app/Resources/static/themes/material/css/dark_theme.scss rename to assets/material/css/dark_theme.scss diff --git a/app/Resources/static/themes/material/css/entries.scss b/assets/material/css/entries.scss similarity index 100% rename from app/Resources/static/themes/material/css/entries.scss rename to assets/material/css/entries.scss diff --git a/app/Resources/static/themes/material/css/filters.scss b/assets/material/css/filters.scss similarity index 100% rename from app/Resources/static/themes/material/css/filters.scss rename to assets/material/css/filters.scss diff --git a/app/Resources/static/themes/material/css/fonts.scss b/assets/material/css/fonts.scss similarity index 100% rename from app/Resources/static/themes/material/css/fonts.scss rename to assets/material/css/fonts.scss diff --git a/app/Resources/static/themes/material/css/icons.scss b/assets/material/css/icons.scss similarity index 100% rename from app/Resources/static/themes/material/css/icons.scss rename to assets/material/css/icons.scss diff --git a/app/Resources/static/themes/material/css/index.scss b/assets/material/css/index.scss similarity index 100% rename from app/Resources/static/themes/material/css/index.scss rename to assets/material/css/index.scss diff --git a/app/Resources/static/themes/material/css/layout.scss b/assets/material/css/layout.scss similarity index 100% rename from app/Resources/static/themes/material/css/layout.scss rename to assets/material/css/layout.scss diff --git a/app/Resources/static/themes/material/css/media_queries.scss b/assets/material/css/media_queries.scss similarity index 100% rename from app/Resources/static/themes/material/css/media_queries.scss rename to assets/material/css/media_queries.scss diff --git a/app/Resources/static/themes/material/css/nav.scss b/assets/material/css/nav.scss similarity index 100% rename from app/Resources/static/themes/material/css/nav.scss rename to assets/material/css/nav.scss diff --git a/app/Resources/static/themes/material/css/print.scss b/assets/material/css/print.scss similarity index 100% rename from app/Resources/static/themes/material/css/print.scss rename to assets/material/css/print.scss diff --git a/app/Resources/static/themes/material/css/sidenav.scss b/assets/material/css/sidenav.scss similarity index 100% rename from app/Resources/static/themes/material/css/sidenav.scss rename to assets/material/css/sidenav.scss diff --git a/app/Resources/static/themes/material/css/variables.scss b/assets/material/css/variables.scss similarity index 100% rename from app/Resources/static/themes/material/css/variables.scss rename to assets/material/css/variables.scss diff --git a/app/Resources/static/themes/material/css/various.scss b/assets/material/css/various.scss similarity index 100% rename from app/Resources/static/themes/material/css/various.scss rename to assets/material/css/various.scss diff --git a/app/Resources/static/themes/material/index.js b/assets/material/index.js similarity index 100% rename from app/Resources/static/themes/material/index.js rename to assets/material/index.js diff --git a/app/Resources/static/themes/material/js/shortcuts/entry.js b/assets/material/js/shortcuts/entry.js similarity index 100% rename from app/Resources/static/themes/material/js/shortcuts/entry.js rename to assets/material/js/shortcuts/entry.js diff --git a/app/Resources/static/themes/material/js/shortcuts/main.js b/assets/material/js/shortcuts/main.js similarity index 100% rename from app/Resources/static/themes/material/js/shortcuts/main.js rename to assets/material/js/shortcuts/main.js diff --git a/app/Resources/static/themes/material/js/tools.js b/assets/material/js/tools.js similarity index 100% rename from app/Resources/static/themes/material/js/tools.js rename to assets/material/js/tools.js diff --git a/templates/Entry/entries.xml.twig b/templates/Entry/entries.xml.twig index 5e8f2dd1d..087b61be3 100644 --- a/templates/Entry/entries.xml.twig +++ b/templates/Entry/entries.xml.twig @@ -27,7 +27,7 @@ {{ user }} {{ asset('favicon.ico') }} - {{ asset('bundles/wallabagcore/themes/_global/img/logo-square.png') }} + {{ asset('img/logo-square.svg') }} {% for entry in entries %} <![CDATA[{{ entry.title|e }}]]> diff --git a/tests/Controller/FeedControllerTest.php b/tests/Controller/FeedControllerTest.php index ec837d910..dadcff5b3 100644 --- a/tests/Controller/FeedControllerTest.php +++ b/tests/Controller/FeedControllerTest.php @@ -27,7 +27,7 @@ class FeedControllerTest extends WallabagTestCase $this->assertSame(1, $xpath->query('/a:feed/a:title')->length); $this->assertStringContainsString('favicon.ico', $xpath->query('/a:feed/a:icon')->item(0)->nodeValue); - $this->assertStringContainsString('logo-square.png', $xpath->query('/a:feed/a:logo')->item(0)->nodeValue); + $this->assertStringContainsString('logo-square.svg', $xpath->query('/a:feed/a:logo')->item(0)->nodeValue); $this->assertSame(1, $xpath->query('/a:feed/a:updated')->length);