diff --git a/public/css/webfonts/vendor/@fortawesome/fontawesome-free/webfa-regular-400.ttf b/public/css/webfonts/webfa-regular-400.ttf similarity index 100% rename from public/css/webfonts/vendor/@fortawesome/fontawesome-free/webfa-regular-400.ttf rename to public/css/webfonts/webfa-regular-400.ttf diff --git a/public/css/webfonts/vendor/@fortawesome/fontawesome-free/webfa-regular-400.woff2 b/public/css/webfonts/webfa-regular-400.woff2 similarity index 100% rename from public/css/webfonts/vendor/@fortawesome/fontawesome-free/webfa-regular-400.woff2 rename to public/css/webfonts/webfa-regular-400.woff2 diff --git a/public/css/webfonts/vendor/@fortawesome/fontawesome-free/webfa-solid-900.ttf b/public/css/webfonts/webfa-solid-900.ttf similarity index 100% rename from public/css/webfonts/vendor/@fortawesome/fontawesome-free/webfa-solid-900.ttf rename to public/css/webfonts/webfa-solid-900.ttf diff --git a/public/css/webfonts/vendor/@fortawesome/fontawesome-free/webfa-solid-900.woff2 b/public/css/webfonts/webfa-solid-900.woff2 similarity index 100% rename from public/css/webfonts/vendor/@fortawesome/fontawesome-free/webfa-solid-900.woff2 rename to public/css/webfonts/webfa-solid-900.woff2 diff --git a/resources/sass/_variables.scss b/resources/sass/_variables.scss index 349faa8..1beabcb 100644 --- a/resources/sass/_variables.scss +++ b/resources/sass/_variables.scss @@ -1,2 +1,2 @@ // FontAwesome -$fa-font-path: "webfonts/vendor/@fortawesome/fontawesome-free"; \ No newline at end of file +$fa-font-path: "webfonts"; \ No newline at end of file diff --git a/webpack.mix.js b/webpack.mix.js index 78f79f6..0976109 100644 --- a/webpack.mix.js +++ b/webpack.mix.js @@ -12,11 +12,20 @@ const mix = require('laravel-mix'); */ mix.js('resources/js/app.js', 'public/js').postCss('resources/css/app.css', 'public/css'); -mix.sass('resources/sass/app.scss', 'public/css'); -mix.options({ - fileLoaderDirs: { - fonts: 'css/webfonts' - } -}); +mix.sass('resources/sass/app.scss', 'public/css').options({ + processCssUrls: false +}).copy( + 'node_modules/@fortawesome/fontawesome-free/webfonts/fa-regular-400.ttf', + 'public/webfonts/webfa-regular-400.ttf' +).copy( + 'node_modules/@fortawesome/fontawesome-free/webfonts/fa-regular-400.woff2', + 'public/webfonts/webfa-regular-400.woff2' +).copy( + 'node_modules/@fortawesome/fontawesome-free/webfonts/fa-solid-900.ttf', + 'public/webfonts/webfa-solid-900.ttf' +).copy( + 'node_modules/@fortawesome/fontawesome-free/webfonts/fa-solid-900.woff2', + 'public/webfonts/webfa-solid-900.woff2' +); mix.postCss('resources/css/light.css', 'public/css'); mix.postCss('resources/css/dark.css', 'public/css'); \ No newline at end of file