Move CSS, JS and fonts

This commit is contained in:
Oliver Davies 2018-10-27 20:05:16 +01:00
parent cfdef969aa
commit 5a09dcdb19
3 changed files with 9 additions and 7 deletions

4
.gitignore vendored
View file

@ -1,5 +1,7 @@
/mix-manifest.json /mix-manifest.json
/node_modules/ /node_modules/
/output_*/ /output_*/
/source/dist/ /source/css/
/source/fonts/
/source/js/
/vendor/ /vendor/

View file

@ -13,7 +13,7 @@
<title>{{ helpers.htmlTitle(site, page) }}</title> <title>{{ helpers.htmlTitle(site, page) }}</title>
{% include 'meta' %} {% include 'meta' %}
<link rel="stylesheet" href="/dist/css/app.css"> <link rel="stylesheet" href="/css/app.css">
{% block stylesheets %}{% endblock %} {% block stylesheets %}{% endblock %}
{% for size in site.apple_touch_icon_sizes %} {% for size in site.apple_touch_icon_sizes %}
@ -71,7 +71,7 @@
<script async src="https://platform.twitter.com/widgets.js" charset="utf-8"></script> <script async src="https://platform.twitter.com/widgets.js" charset="utf-8"></script>
{% endif %} {% endif %}
<script src="/dist/js/all.js"></script> <script src="/js/all.js"></script>
{% block scripts %}{% endblock %} {% block scripts %}{% endblock %}
</body> </body>
</html> </html>

View file

@ -4,13 +4,13 @@ require('laravel-mix-purgecss');
require('laravel-mix-tailwind'); require('laravel-mix-tailwind');
mix.disableNotifications() mix.disableNotifications()
.postCss('assets/css/app.css', 'source/dist/css') .postCss('assets/css/app.css', 'source/css')
.js([ .js([
// 'node_modules/highlightjs/highlight.pack.js', // 'node_modules/highlightjs/highlight.pack.js',
'node_modules/jquery/dist/jquery.js', 'node_modules/jquery/src/jquery.js',
'assets/js/app.js', 'assets/js/app.js',
], 'source/dist/js/all.js') ], 'source/js/all.js')
.copyDirectory('node_modules/font-awesome/fonts', 'source/dist/fonts') .copyDirectory('node_modules/font-awesome/fonts', 'source/fonts')
.tailwind() .tailwind()
.purgeCss({ .purgeCss({
globs: [ globs: [