diff --git a/404.html b/404.html
index 82bfdf8..4fac99d 100644
--- a/404.html
+++ b/404.html
@@ -1,202 +1,400 @@
-
+
-
-
-
-
-
+
+
+
+
+
- SB Admin - 404 Error
+ SB Admin 2 - 404
-
-
+
+
+
-
-
+
+
-
-
+
-
-
+
-
+
+
-
+
+
diff --git a/js/demo/chart-area-demo.js b/js/demo/chart-area-demo.js
index 8b0589d..0bb9c4d 100644
--- a/js/demo/chart-area-demo.js
+++ b/js/demo/chart-area-demo.js
@@ -53,10 +53,10 @@ var myLineChart = new Chart(ctx, {
maintainAspectRatio: false,
layout: {
padding: {
- left: 0,
+ left: 10,
right: 25,
top: 25,
- bottom: 25
+ bottom: 0
}
},
scales: {
diff --git a/js/demo/chart-bar-demo.js b/js/demo/chart-bar-demo.js
index 049ad20..89ec2dd 100644
--- a/js/demo/chart-bar-demo.js
+++ b/js/demo/chart-bar-demo.js
@@ -1,46 +1,111 @@
// Set new default font family and font color to mimic Bootstrap's default styling
-Chart.defaults.global.defaultFontFamily = '-apple-system,system-ui,BlinkMacSystemFont,"Segoe UI",Roboto,"Helvetica Neue",Arial,sans-serif';
-Chart.defaults.global.defaultFontColor = '#292b2c';
+Chart.defaults.global.defaultFontFamily = 'Nunito', '-apple-system,system-ui,BlinkMacSystemFont,"Segoe UI",Roboto,"Helvetica Neue",Arial,sans-serif';
+Chart.defaults.global.defaultFontColor = '#858796';
+
+function number_format(number, decimals, dec_point, thousands_sep) {
+ // * example: number_format(1234.56, 2, ',', ' ');
+ // * return: '1 234,56'
+ number = (number + '').replace(',', '').replace(' ', '');
+ var n = !isFinite(+number) ? 0 : +number,
+ prec = !isFinite(+decimals) ? 0 : Math.abs(decimals),
+ sep = (typeof thousands_sep === 'undefined') ? ',' : thousands_sep,
+ dec = (typeof dec_point === 'undefined') ? '.' : dec_point,
+ s = '',
+ toFixedFix = function(n, prec) {
+ var k = Math.pow(10, prec);
+ return '' + Math.round(n * k) / k;
+ };
+ // Fix for IE parseFloat(0.55).toFixed(0) = 0;
+ s = (prec ? toFixedFix(n, prec) : '' + Math.round(n)).split('.');
+ if (s[0].length > 3) {
+ s[0] = s[0].replace(/\B(?=(?:\d{3})+(?!\d))/g, sep);
+ }
+ if ((s[1] || '').length < prec) {
+ s[1] = s[1] || '';
+ s[1] += new Array(prec - s[1].length + 1).join('0');
+ }
+ return s.join(dec);
+}
// Bar Chart Example
var ctx = document.getElementById("myBarChart");
-var myLineChart = new Chart(ctx, {
+var myBarChart = new Chart(ctx, {
type: 'bar',
data: {
labels: ["January", "February", "March", "April", "May", "June"],
datasets: [{
label: "Revenue",
- backgroundColor: "rgba(2,117,216,1)",
- borderColor: "rgba(2,117,216,1)",
+ backgroundColor: "#4e73df",
+ hoverBackgroundColor: "#2e59d9",
+ borderColor: "#4e73df",
data: [4215, 5312, 6251, 7841, 9821, 14984],
}],
},
options: {
+ maintainAspectRatio: false,
+ layout: {
+ padding: {
+ left: 10,
+ right: 25,
+ top: 25,
+ bottom: 0
+ }
+ },
scales: {
xAxes: [{
time: {
unit: 'month'
},
gridLines: {
- display: false
+ display: false,
+ drawBorder: false
},
ticks: {
maxTicksLimit: 6
- }
+ },
+ maxBarThickness: 25,
}],
yAxes: [{
ticks: {
min: 0,
max: 15000,
- maxTicksLimit: 5
+ maxTicksLimit: 5,
+ padding: 10,
+ // Include a dollar sign in the ticks
+ callback: function(value, index, values) {
+ return '$' + number_format(value);
+ }
},
gridLines: {
- display: true
+ color: "rgb(234, 236, 244)",
+ zeroLineColor: "rgb(234, 236, 244)",
+ drawBorder: false,
+ borderDash: [2],
+ zeroLineBorderDash: [2]
}
}],
},
legend: {
display: false
- }
+ },
+ tooltips: {
+ titleMarginBottom: 10,
+ titleFontColor: '#6e707e',
+ titleFontSize: 14,
+ backgroundColor: "rgb(255,255,255)",
+ bodyFontColor: "#858796",
+ borderColor: '#dddfeb',
+ borderWidth: 1,
+ xPadding: 15,
+ yPadding: 15,
+ displayColors: false,
+ caretPadding: 10,
+ callbacks: {
+ label: function(tooltipItem, chart) {
+ var datasetLabel = chart.datasets[tooltipItem.datasetIndex].label || '';
+ return datasetLabel + ': $' + number_format(tooltipItem.yLabel);
+ }
+ }
+ },
}
});
diff --git a/js/demo/chart-pie-demo.js b/js/demo/chart-pie-demo.js
index 4e16c41..c393ac1 100644
--- a/js/demo/chart-pie-demo.js
+++ b/js/demo/chart-pie-demo.js
@@ -1,16 +1,35 @@
// Set new default font family and font color to mimic Bootstrap's default styling
-Chart.defaults.global.defaultFontFamily = '-apple-system,system-ui,BlinkMacSystemFont,"Segoe UI",Roboto,"Helvetica Neue",Arial,sans-serif';
-Chart.defaults.global.defaultFontColor = '#292b2c';
+Chart.defaults.global.defaultFontFamily = 'Nunito', '-apple-system,system-ui,BlinkMacSystemFont,"Segoe UI",Roboto,"Helvetica Neue",Arial,sans-serif';
+Chart.defaults.global.defaultFontColor = '#858796';
// Pie Chart Example
var ctx = document.getElementById("myPieChart");
var myPieChart = new Chart(ctx, {
- type: 'pie',
+ type: 'doughnut',
data: {
- labels: ["Blue", "Red", "Yellow", "Green"],
+ labels: ["Direct", "Referral", "Social"],
datasets: [{
- data: [12.21, 15.58, 11.25, 8.32],
- backgroundColor: ['#007bff', '#dc3545', '#ffc107', '#28a745'],
+ data: [55, 30, 15],
+ backgroundColor: ['#4e73df', '#1cc88a', '#36b9cc'],
+ hoverBackgroundColor: ['#2e59d9', '#17a673', '#2c9faf'],
+ hoverBorderColor: "rgba(234, 236, 244, 1)",
}],
},
+ options: {
+ maintainAspectRatio: false,
+ tooltips: {
+ backgroundColor: "rgb(255,255,255)",
+ bodyFontColor: "#858796",
+ borderColor: '#dddfeb',
+ borderWidth: 1,
+ xPadding: 15,
+ yPadding: 15,
+ displayColors: false,
+ caretPadding: 10,
+ },
+ legend: {
+ display: false
+ },
+ cutoutPercentage: 80,
+ },
});
diff --git a/js/sb-admin-2.js b/js/sb-admin-2.js
index b03bc05..9e96613 100644
--- a/js/sb-admin-2.js
+++ b/js/sb-admin-2.js
@@ -2,12 +2,20 @@
"use strict"; // Start of use strict
// Toggle the side navigation
- $("#sidebarToggle, #sidebarToggleTop").on('click',function(e) {
- e.preventDefault();
+ $("#sidebarToggle, #sidebarToggleTop").on('click', function(e) {
$("body").toggleClass("sidebar-toggled");
$(".sidebar").toggleClass("toggled");
+ if ($(".sidebar").hasClass("toggled")) {
+ $('.sidebar .collapse').collapse('hide');
+ };
});
+ // Close any open menu accordions when window is resized below 768px
+ $(window).resize(function() {
+ if ($(window).width() < 768) {
+ $('.sidebar .collapse').collapse('hide');
+ };
+ });
// Prevent the content wrapper from scrolling when the fixed side navigation hovered over
$('body.fixed-nav .sidebar').on('mousewheel DOMMouseScroll wheel', function(e) {
@@ -20,7 +28,7 @@
});
// Scroll to top button appear
- $(document).on('scroll',function() {
+ $(document).on('scroll', function() {
var scrollDistance = $(this).scrollTop();
if (scrollDistance > 100) {
$('.scroll-to-top').fadeIn();
@@ -30,12 +38,12 @@
});
// Smooth scrolling using jQuery easing
- $(document).on('click', 'a.scroll-to-top', function(event) {
+ $(document).on('click', 'a.scroll-to-top', function(e) {
var $anchor = $(this);
$('html, body').stop().animate({
scrollTop: ($($anchor.attr('href')).offset().top)
}, 1000, 'easeInOutExpo');
- event.preventDefault();
+ e.preventDefault();
});
})(jQuery); // End of use strict
diff --git a/js/sb-admin-2.min.js b/js/sb-admin-2.min.js
index 4e08eeb..1ea3e4e 100644
--- a/js/sb-admin-2.min.js
+++ b/js/sb-admin-2.min.js
@@ -4,4 +4,4 @@
* Licensed under MIT (https://github.com/BlackrockDigital/startbootstrap-sb-admin-2/blob/master/LICENSE)
*/
-!function(l){"use strict";l("#sidebarToggle, #sidebarToggleTop").on("click",function(o){o.preventDefault(),l("body").toggleClass("sidebar-toggled"),l(".sidebar").toggleClass("toggled")}),l("body.fixed-nav .sidebar").on("mousewheel DOMMouseScroll wheel",function(o){if(768