diff --git a/.gitignore b/.gitignore index 7f917eb8..1eb43c2e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,7 @@ /mix-manifest.json /node_modules/ /output_*/ -/source/dist/ +/source/css/ +/source/fonts/ +/source/js/ /vendor/ diff --git a/source/_layouts/base.html.twig b/source/_layouts/base.html.twig index b8a66b72..d20ddef8 100644 --- a/source/_layouts/base.html.twig +++ b/source/_layouts/base.html.twig @@ -13,7 +13,7 @@ {{ helpers.htmlTitle(site, page) }} {% include 'meta' %} - + {% block stylesheets %}{% endblock %} {% for size in site.apple_touch_icon_sizes %} @@ -71,7 +71,7 @@ {% endif %} - + {% block scripts %}{% endblock %} diff --git a/webpack.mix.js b/webpack.mix.js index 27edacb5..896acb8a 100644 --- a/webpack.mix.js +++ b/webpack.mix.js @@ -4,13 +4,13 @@ require('laravel-mix-purgecss'); require('laravel-mix-tailwind'); mix.disableNotifications() - .postCss('assets/css/app.css', 'source/dist/css') + .postCss('assets/css/app.css', 'source/css') .js([ // 'node_modules/highlightjs/highlight.pack.js', - 'node_modules/jquery/dist/jquery.js', + 'node_modules/jquery/src/jquery.js', 'assets/js/app.js', - ], 'source/dist/js/all.js') - .copyDirectory('node_modules/font-awesome/fonts', 'source/dist/fonts') + ], 'source/js/all.js') + .copyDirectory('node_modules/font-awesome/fonts', 'source/fonts') .tailwind() .purgeCss({ globs: [