aboutsummaryrefslogtreecommitdiff
path: root/resources/views/layouts
diff options
context:
space:
mode:
authorMateja Marić <mail@matejamaric.com>2021-03-08 17:42:48 +0100
committerGitHub <noreply@github.com>2021-03-08 17:42:48 +0100
commit21e9e94e76a21516edc3d1e4d0462a0ba75aafa4 (patch)
treea8a6ca630da99586bccbcb30258ba770eedc560e /resources/views/layouts
parent99780d02d2e0db0dc677f87ff236b0b867e270cb (diff)
parente3e00c1fce9e40b279a509c129d4cc65d88cd9c3 (diff)
downloadyota-laravel-21e9e94e76a21516edc3d1e4d0462a0ba75aafa4.tar.gz
yota-laravel-21e9e94e76a21516edc3d1e4d0462a0ba75aafa4.zip
Merge pull request #3 from MatejaMaric/use-laravel-mixv1.2.0
Use Laravel Mix.
Diffstat (limited to 'resources/views/layouts')
-rw-r--r--resources/views/layouts/app.blade.php11
1 files changed, 4 insertions, 7 deletions
diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php
index 3cb8667..79235ac 100644
--- a/resources/views/layouts/app.blade.php
+++ b/resources/views/layouts/app.blade.php
@@ -3,11 +3,8 @@
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
-
- <link rel="stylesheet" href="{{ asset('css/app.css') }}" type="text/css">
- <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.5.2/css/bootstrap.min.css" integrity="sha384-JcKb8q3iqJ61gNV9KGb8thSsNjpSL0n8PARn9HuZOnIxN0hoP+VmmDGMN5t9UJ0Z" crossorigin="anonymous">
+ <link rel="stylesheet" href="{{ mix('css/app.css') }}" type="text/css">
@yield('styles')
-
<title>YOTA - @yield('title')</title>
</head>
<body>
@@ -16,9 +13,9 @@
<div class="container pt-3">
@yield('content')
</div>
- <script src="https://code.jquery.com/jquery-3.5.1.min.js" integrity="sha256-9/aliU8dGd2tb6OSsuzixeV4y/faTqgFtohetphbbj0=" crossorigin="anonymous"></script>
- <script src="https://cdn.jsdelivr.net/npm/popper.js@1.16.1/dist/umd/popper.min.js" integrity="sha384-9/reFTGAW83EW2RDu2S0VKaIzap3H66lZH81PoYlFhbGU+6BZp6G7niu735Sk7lN" crossorigin="anonymous"></script>
- <script src="https://stackpath.bootstrapcdn.com/bootstrap/4.5.2/js/bootstrap.min.js" integrity="sha384-B4gt1jrGC7Jh4AgTPSdUtOBvfO8shuf57BaghqFfPlYxofvL8/KUEfYiJOMMV+rV" crossorigin="anonymous"></script>
+ <script src="{{ mix('js/manifest.js') }}"></script>
+ <script src="{{ mix('js/vendor.js') }}"></script>
+ <script src="{{ mix('js/app.js') }}"></script>
@yield('scripts')
</body>
</html>