DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-03-05 20:52:15 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Allegedly fixes #3995 - subdirectory issues with JS/CSS

Browse source
This commit is contained in:
snipe 2017-09-25 15:39:18 -07:00
parent c3afbc0e53
commit 6ee939d29b
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
resources/views/layouts/default.blade.php
View file

@ -13,17 +13,17 @@
<meta content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" name="viewport"> <meta content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" name="viewport">
<!-- Select2 --> <!-- Select2 -->
<link rel="stylesheet" href="{{ asset('js/plugins/select2/select2.min.css') }}"> <link rel="stylesheet" href="{{ url(asset('js/plugins/select2/select2.min.css')) }}">
<!-- iCheck for checkboxes and radio inputs --> <!-- iCheck for checkboxes and radio inputs -->
<link rel="stylesheet" href="{{ asset('js/plugins/iCheck/all.css') }}"> <link rel="stylesheet" href="{{ url(asset('js/plugins/iCheck/all.css')) }}">
<!-- bootstrap tables CSS --> <!-- bootstrap tables CSS -->
<link rel="stylesheet" href="{{ asset('css/bootstrap-table.css') }}"> <link rel="stylesheet" href="{{ url(asset('css/bootstrap-table.css')) }}">
<link rel="stylesheet" href="{{ mix('css/dist/all.css') }}"> <link rel="stylesheet" href="{{ url(mix('css/dist/all.css')) }}">
<link rel="shortcut icon" type="image/ico" href="{{ asset('favicon.ico') }}"> <link rel="shortcut icon" type="image/ico" href="{{ url(asset('favicon.ico')) }}">
<meta name="csrf-token" content="{{ csrf_token() }}"> <meta name="csrf-token" content="{{ csrf_token() }}">
@ -88,8 +88,8 @@
<script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script> <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
@else @else
<script src="{{ asset('js/html5shiv.js') }}"></script> <script src="{{ url(asset('js/html5shiv.js')) }}"></script>
<script src="{{ asset('js/respond.js') }}"></script> <script src="{{ url(asset('js/respond.js')) }}"></script>
@endif @endif
<![endif]--> <![endif]-->
</head> </head>
@ -662,7 +662,7 @@
<script src="{{ mix('js/dist/all.js') }}"></script> <script src="{{ url(mix('js/dist/all.js')) }}"></script>
<script> <script>
$(function () { $(function () {
var datepicker = $.fn.datepicker.noConflict(); // return $.fn.datepicker to previously assigned value var datepicker = $.fn.datepicker.noConflict(); // return $.fn.datepicker to previously assigned value