Merge branch '3.2.5' into 'dev'

Turn on perfect-scrollbar

See merge request TheGamecraft/c-cms!91
This commit is contained in:
Mathieu Lagace
2019-12-22 18:13:58 +00:00
2 changed files with 4 additions and 4 deletions

View File

@@ -20,11 +20,11 @@
if (isWindows) { if (isWindows) {
// if we are on windows OS we activate the perfectScrollbar function // if we are on windows OS we activate the perfectScrollbar function
//$('.sidebar .sidebar-wrapper, .main-panel').perfectScrollbar(); $('.sidebar .sidebar-wrapper, .main-panel').perfectScrollbar();
//$('html').addClass('perfect-scrollbar-on'); $('html').addClass('perfect-scrollbar-on');
} else { } else {
//$('html').addClass('perfect-scrollbar-off'); $('html').addClass('perfect-scrollbar-off');
} }
})(); })();

View File

@@ -124,6 +124,6 @@
) )
</script> </script>
<script> <script>
$( document ).ready(initScheduleEditor("scheduleEditor",3,4)); initScheduleEditor("scheduleEditor",3,4);
</script> </script>
@endsection @endsection