DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-11 16:14:18 -08:00
Code Issues Actions 11 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop'

Browse source
This commit is contained in:
snipe 2023-08-08 19:01:40 +01:00
parent 5a43c5906f 521961457d
commit 70903f068c
2 changed files with 15 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -973,7 +973,12 @@
$(function () { $(function () {
$('[data-tooltip="true"]').tooltip(); // Invoke Bootstrap 3's tooltip
$('[data-tooltip="true"]').tooltip({
container: 'body',
animation: true,
});
$('[data-toggle="popover"]').popover(); $('[data-toggle="popover"]').popover();
$('.select2 span').addClass('needsclick'); $('.select2 span').addClass('needsclick');
$('.select2 span').removeAttr('title'); $('.select2 span').removeAttr('title');

9
resources/views/models/custom_fields_form.blade.php
View file

@ -85,3 +85,12 @@
</div> </div>
@endforeach @endforeach
@endif @endif
<script nonce="{{ csrf_token() }}">
// We have to re-call the tooltip since this is pulled in after the DOM has loaded
$('[data-tooltip="true"]').tooltip({
container: 'body',
animation: true,
});
</script>