Skip to content
This repository has been archived by the owner on Oct 15, 2023. It is now read-only.

Commit

Permalink
Merge branch 'dev'
Browse files Browse the repository at this point in the history
  • Loading branch information
naywin-programmer committed Sep 30, 2019
2 parents 8e5b8b0 + 4f9c42f commit fed04d8
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 0 deletions.
1 change: 1 addition & 0 deletions public/vendor/assets/scripts/script.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
$(function() {
const ps = new PerfectScrollbar('.scrollbar-sidebar');
let path = window.location.href;
$('a.sidebar-item').removeClass('mm-active');
$("a.sidebar-item").each(function () {
Expand Down
1 change: 1 addition & 0 deletions resources/views/backend/admin/layouts/assets/css.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,5 @@
<link rel="stylesheet" href="https://cdn.datatables.net/1.10.19/css/dataTables.bootstrap4.min.css">
<link href="https://cdnjs.cloudflare.com/ajax/libs/select2/4.0.10/css/select2.min.css" rel="stylesheet" />
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/select2-bootstrap-theme/0.1.0-beta.10/select2-bootstrap.min.css" integrity="sha256-nbyata2PJRjImhByQzik2ot6gSHSU4Cqdz5bNYL2zcU=" crossorigin="anonymous" />
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/jquery.perfect-scrollbar/1.4.0/css/perfect-scrollbar.min.css" integrity="sha256-Eff0vTAskMNGMXDva8NMruf8ex6k9EuZ4QXf09lxwaQ=" crossorigin="anonymous" />
@yield('style')
1 change: 1 addition & 0 deletions resources/views/backend/admin/layouts/assets/js.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
<script src="{{ asset('vendor/jsvalidation/js/jsvalidation.min.js') }}"></script>
<script src="https://cdn.datatables.net/1.10.19/js/jquery.dataTables.min.js"></script>
<script src="https://cdn.datatables.net/1.10.19/js/dataTables.bootstrap4.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery.perfect-scrollbar/1.4.0/perfect-scrollbar.min.js" integrity="sha256-pOydVY7re8c1n+fEgg3uoslR/di9NMsOFXJ0Esf2xjQ=" crossorigin="anonymous"></script>
@include('layouts.assets.select2')
@include('layouts.assets.toast')
@yield('script')

0 comments on commit fed04d8

Please sign in to comment.