c-cms/c-cms-legacy
1
0
Fork 0
mirror of https://gitlab.com/TheGamecraft/c-cms.git synced 2026-04-21 10:49:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/3.2.5' into 3.2.5

Browse Source
This commit is contained in:
Lagacé Mathieu
2020-01-22 12:04:39 -05:00
parent a4e5a647d6 9e21124e90
commit ef6f403e1b
28 changed files with 2606 additions and 231 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
resources/views/layouts/admin/head.blade.php
View File

@@ -26,7 +26,7 @@
<link href='/assets/fullcalendar/daygrid/main.css' rel='stylesheet' />
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/Trumbowyg/2.18.0/ui/trumbowyg.css">
<link rel="stylesheet" href="/assets/jquery-ui-1.12.1/jquery-ui.theme.css">
<link rel="stylesheet" href="/css/contextLoader.min.css">
<!-- Custom CSS -->
<link rel="stylesheet" href="/css/custom.css">

6
resources/views/layouts/admin/scripts.blade.php
View File

@@ -1,10 +1,11 @@
<script src="/js/core/jquery.min.js"></script>
<script src="/js/core/popper.min.js"></script>
<script src="/js/core/bootstrap-material-design.min.js"></script>
<script src="/js/material-dashboard.js"></script>
<!-- Plugin for the Perfect Scrollbar -->
<script src="/js/plugins/perfect-scrollbar.jquery.min.js"></script>
<script src="/js/core/bootstrap-material-design.min.js"></script>
<script src="/js/material-dashboard.js"></script>
<!-- Plugin for the momentJs -->
<script src="/js/plugins/moment.min.js"></script>
<!-- Plugin for Sweet Alert -->
@@ -30,6 +31,7 @@
<script src="https://cdnjs.cloudflare.com/ajax/libs/Trumbowyg/2.18.0/langs/fr.js"></script>
<script src="/js/notify.js"></script>
<script src="/js/plugins/contextLoader.min.js"></script>
<script>
var api_token = "<?php echo Auth::User()->api_token ?>";
$('.sidebar .sidebar-wrapper, .main-panel').perfectScrollbar();