From 57c4748f47ab92eb5f88cacdeaf74f7005cc5c72 Mon Sep 17 00:00:00 2001 From: David Miller Date: Wed, 19 May 2021 12:49:24 -0400 Subject: [PATCH] Bootstrap 5 update --- dist/401.html | 7 +- dist/404.html | 7 +- dist/500.html | 7 +- dist/assets/demo/chart-area-demo.js | 54 - dist/assets/demo/chart-bar-demo.js | 46 - dist/assets/demo/chart-pie-demo.js | 16 - dist/assets/demo/datatables-demo.js | 4 - dist/assets/img/error-404-monochrome.svg | 1 - dist/charts.html | 59 +- dist/css/styles.css | 10271 ---------------- dist/index.html | 1028 +- dist/js/scripts.js | 22 - dist/layout-sidenav-light.html | 53 +- dist/layout-static.html | 53 +- dist/login.html | 31 +- dist/password.html | 17 +- dist/register.html | 47 +- dist/tables.html | 638 - package-lock.json | 3290 +---- package.json | 12 +- src/js/datatables-simple-demo.js | 9 + src/js/scripts.js | 32 +- src/pug/layouts/includes/footer.pug | 2 +- .../layouts/includes/navigation/sidenav.pug | 16 +- .../layouts/includes/navigation/topnav.pug | 38 +- src/pug/layouts/includes/scripts.pug | 4 +- src/pug/pages/401.pug | 2 +- src/pug/pages/404.pug | 2 +- src/pug/pages/500.pug | 2 +- src/pug/pages/charts.pug | 8 +- src/pug/pages/includes/datatable.pug | 829 +- src/pug/pages/index.pug | 20 +- src/pug/pages/layout-sidenav-light.pug | 2 +- src/pug/pages/layout-static.pug | 2 +- src/pug/pages/login.pug | 27 +- src/pug/pages/password.pug | 13 +- src/pug/pages/register.pug | 44 +- src/pug/pages/tables.pug | 15 +- src/scss/_global.scss | 14 +- src/scss/_variables.scss | 4 + src/scss/layout/_authentication.scss | 26 +- src/scss/layout/_dashboard-default.scss | 131 +- src/scss/layout/_dashboard-fixed.scss | 48 +- src/scss/layout/_error.scss | 26 +- src/scss/navigation/_nav.scss | 10 +- src/scss/navigation/_topnav.scss | 45 +- .../navigation/sidenav/_sidenav-dark.scss | 64 +- .../navigation/sidenav/_sidenav-light.scss | 64 +- src/scss/navigation/sidenav/_sidenav.scss | 99 +- src/scss/plugins/simple-datatables.scss | 201 + src/scss/styles.scss | 7 + src/scss/variables/_navigation.scss | 4 + src/scss/variables/_spacing.scss | 6 +- 53 files changed, 1804 insertions(+), 15675 deletions(-) delete mode 100644 dist/assets/demo/chart-area-demo.js delete mode 100644 dist/assets/demo/chart-bar-demo.js delete mode 100644 dist/assets/demo/chart-pie-demo.js delete mode 100644 dist/assets/demo/datatables-demo.js delete mode 100644 dist/assets/img/error-404-monochrome.svg delete mode 100644 dist/css/styles.css delete mode 100644 dist/js/scripts.js delete mode 100644 dist/tables.html create mode 100644 src/js/datatables-simple-demo.js create mode 100644 src/scss/plugins/simple-datatables.scss diff --git a/dist/401.html b/dist/401.html index d4d8f0e1..9e7ef6f8 100644 --- a/dist/401.html +++ b/dist/401.html @@ -22,7 +22,7 @@

401

Unauthorized

Access to this resource is denied.

- + Return to Dashboard @@ -33,7 +33,7 @@

401

- - + diff --git a/dist/404.html b/dist/404.html index 5488980e..f89121b4 100644 --- a/dist/404.html +++ b/dist/404.html @@ -21,7 +21,7 @@

This requested URL was not found on this server.

- + Return to Dashboard @@ -32,7 +32,7 @@ - - + diff --git a/dist/500.html b/dist/500.html index e47ab94a..4badce5e 100644 --- a/dist/500.html +++ b/dist/500.html @@ -21,7 +21,7 @@

500

Internal Server Error

- + Return to Dashboard @@ -32,7 +32,7 @@

500

- - + diff --git a/dist/assets/demo/chart-area-demo.js b/dist/assets/demo/chart-area-demo.js deleted file mode 100644 index f63ff916..00000000 --- a/dist/assets/demo/chart-area-demo.js +++ /dev/null @@ -1,54 +0,0 @@ -// 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'; - -// Area Chart Example -var ctx = document.getElementById("myAreaChart"); -var myLineChart = new Chart(ctx, { - type: 'line', - data: { - labels: ["Mar 1", "Mar 2", "Mar 3", "Mar 4", "Mar 5", "Mar 6", "Mar 7", "Mar 8", "Mar 9", "Mar 10", "Mar 11", "Mar 12", "Mar 13"], - datasets: [{ - label: "Sessions", - lineTension: 0.3, - backgroundColor: "rgba(2,117,216,0.2)", - borderColor: "rgba(2,117,216,1)", - pointRadius: 5, - pointBackgroundColor: "rgba(2,117,216,1)", - pointBorderColor: "rgba(255,255,255,0.8)", - pointHoverRadius: 5, - pointHoverBackgroundColor: "rgba(2,117,216,1)", - pointHitRadius: 50, - pointBorderWidth: 2, - data: [10000, 30162, 26263, 18394, 18287, 28682, 31274, 33259, 25849, 24159, 32651, 31984, 38451], - }], - }, - options: { - scales: { - xAxes: [{ - time: { - unit: 'date' - }, - gridLines: { - display: false - }, - ticks: { - maxTicksLimit: 7 - } - }], - yAxes: [{ - ticks: { - min: 0, - max: 40000, - maxTicksLimit: 5 - }, - gridLines: { - color: "rgba(0, 0, 0, .125)", - } - }], - }, - legend: { - display: false - } - } -}); diff --git a/dist/assets/demo/chart-bar-demo.js b/dist/assets/demo/chart-bar-demo.js deleted file mode 100644 index 049ad204..00000000 --- a/dist/assets/demo/chart-bar-demo.js +++ /dev/null @@ -1,46 +0,0 @@ -// 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'; - -// Bar Chart Example -var ctx = document.getElementById("myBarChart"); -var myLineChart = 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)", - data: [4215, 5312, 6251, 7841, 9821, 14984], - }], - }, - options: { - scales: { - xAxes: [{ - time: { - unit: 'month' - }, - gridLines: { - display: false - }, - ticks: { - maxTicksLimit: 6 - } - }], - yAxes: [{ - ticks: { - min: 0, - max: 15000, - maxTicksLimit: 5 - }, - gridLines: { - display: true - } - }], - }, - legend: { - display: false - } - } -}); diff --git a/dist/assets/demo/chart-pie-demo.js b/dist/assets/demo/chart-pie-demo.js deleted file mode 100644 index 4e16c415..00000000 --- a/dist/assets/demo/chart-pie-demo.js +++ /dev/null @@ -1,16 +0,0 @@ -// 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'; - -// Pie Chart Example -var ctx = document.getElementById("myPieChart"); -var myPieChart = new Chart(ctx, { - type: 'pie', - data: { - labels: ["Blue", "Red", "Yellow", "Green"], - datasets: [{ - data: [12.21, 15.58, 11.25, 8.32], - backgroundColor: ['#007bff', '#dc3545', '#ffc107', '#28a745'], - }], - }, -}); diff --git a/dist/assets/demo/datatables-demo.js b/dist/assets/demo/datatables-demo.js deleted file mode 100644 index f2eecbfe..00000000 --- a/dist/assets/demo/datatables-demo.js +++ /dev/null @@ -1,4 +0,0 @@ -// Call the dataTables jQuery plugin -$(document).ready(function() { - $('#dataTable').DataTable(); -}); diff --git a/dist/assets/img/error-404-monochrome.svg b/dist/assets/img/error-404-monochrome.svg deleted file mode 100644 index f0d345f9..00000000 --- a/dist/assets/img/error-404-monochrome.svg +++ /dev/null @@ -1 +0,0 @@ -error-404-monochrome \ No newline at end of file diff --git a/dist/charts.html b/dist/charts.html index a14cf4cc..0e515827 100644 --- a/dist/charts.html +++ b/dist/charts.html @@ -12,28 +12,28 @@
@@ -47,40 +47,40 @@ Dashboard
Interface
- -
+ - -
+