From 858283134f05abbf2f52f7d6cee169c3705aa3eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Fastr=C3=A9?= Date: Fri, 30 Apr 2021 13:57:50 +0200 Subject: [PATCH] fix paths in assets --- src/Bundle/ChillMainBundle/chill.webpack.config.js | 4 ++-- .../ChillPersonBundle/Resources/public/sass/person.scss | 2 +- src/Bundle/ChillTaskBundle/Resources/public/sass/_task.scss | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Bundle/ChillMainBundle/chill.webpack.config.js b/src/Bundle/ChillMainBundle/chill.webpack.config.js index 4b80320cc..27e1edf1c 100644 --- a/src/Bundle/ChillMainBundle/chill.webpack.config.js +++ b/src/Bundle/ChillMainBundle/chill.webpack.config.js @@ -1,8 +1,8 @@ // this file loads all assets from the Chill main bundle module.exports = function(encore, entries) { entries.push(__dirname + '/Resources/public/main.js'); - encore.addEntry('login', './vendor/chill-project/main/Resources/public/modules/login_page/index.js'); - encore.addEntry('tabs', './vendor/chill-project/main/Resources/public/modules/tabs/index.js'); + encore.addEntry('login', __dirname + '/Resources/public/modules/login_page/index.js'); + encore.addEntry('tabs', __dirname + '/Resources/public/modules/tabs/index.js'); encore.addAliases({ ShowHide: __dirname + '/Resources/public/modules/show_hide/', ChillMainSass: __dirname + '/Resources/public/sass' diff --git a/src/Bundle/ChillPersonBundle/Resources/public/sass/person.scss b/src/Bundle/ChillPersonBundle/Resources/public/sass/person.scss index 78e3d5b40..e6706f542 100644 --- a/src/Bundle/ChillPersonBundle/Resources/public/sass/person.scss +++ b/src/Bundle/ChillPersonBundle/Resources/public/sass/person.scss @@ -1,5 +1,5 @@ -@import '../../../../main/Resources/public/sass/custom/config/colors'; +@import '../../../../ChillMainBundle/Resources/public/sass/custom/config/colors'; div#header-person-name { background: none repeat scroll 0 0 $chill-green-dark; diff --git a/src/Bundle/ChillTaskBundle/Resources/public/sass/_task.scss b/src/Bundle/ChillTaskBundle/Resources/public/sass/_task.scss index 4e668f3fe..ff4480002 100644 --- a/src/Bundle/ChillTaskBundle/Resources/public/sass/_task.scss +++ b/src/Bundle/ChillTaskBundle/Resources/public/sass/_task.scss @@ -1,4 +1,4 @@ -@import '../../../../main/Resources/public/sass/custom/config/colors'; +@import '../../../../ChillMainBundle/Resources/public/sass/custom/config/colors'; @import "_task-statuses.scss"; @import "_task-list.scss";