From c25710b75f76e23ebcfd42bcae69639fb95835b0 Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Tue, 4 Sep 2018 22:10:47 +0100 Subject: [PATCH] Rename files --- assets/js/{site.js => app.js} | 0 assets/sass/{site.sass => app.sass} | 0 source/_layouts/base.html.twig | 2 +- webpack.mix.js | 4 ++-- 4 files changed, 3 insertions(+), 3 deletions(-) rename assets/js/{site.js => app.js} (100%) rename assets/sass/{site.sass => app.sass} (100%) diff --git a/assets/js/site.js b/assets/js/app.js similarity index 100% rename from assets/js/site.js rename to assets/js/app.js diff --git a/assets/sass/site.sass b/assets/sass/app.sass similarity index 100% rename from assets/sass/site.sass rename to assets/sass/app.sass diff --git a/source/_layouts/base.html.twig b/source/_layouts/base.html.twig index c2b1c0c9..54b3d8a9 100644 --- a/source/_layouts/base.html.twig +++ b/source/_layouts/base.html.twig @@ -19,7 +19,7 @@ {% include 'og' with { og: page.meta.og } %} - + {% block stylesheets %}{% endblock %} {% for size in site.apple_touch_icon_sizes %} diff --git a/webpack.mix.js b/webpack.mix.js index dfb53281..b9b113ed 100644 --- a/webpack.mix.js +++ b/webpack.mix.js @@ -4,11 +4,11 @@ require('laravel-mix-purgecss'); require('laravel-mix-tailwind'); mix.disableNotifications() - .sass('assets/sass/site.sass', 'source/dist/css') + .sass('assets/sass/app.sass', 'source/dist/css') .combine([ 'node_modules/jquery/dist/jquery.js', 'node_modules/highlightjs/highlight.pack.js', - 'assets/js/site.js', + 'assets/js/app.js', ], 'source/dist/js/all.js') .copyDirectory('node_modules/font-awesome/fonts', 'source/dist/fonts') .tailwind()