diff --git a/package.json b/package.json
index 0acf9ebed01698a36ddf2ea893073c3fd9469f5e..52f8a0c009de5d1352f8f818fd9b8fe906f39c36 100644
--- a/package.json
+++ b/package.json
@@ -91,7 +91,8 @@
"dependencies": {
"apexcharts": "3.10.0",
"autosize": "4.0.2",
- "bootstrap": "twbs/bootstrap#8d56c19",
+ "bootstrap": "twbs/bootstrap#9ee9b8a",
+ "chart.js": "^2.8.0",
"imask": "5.2.1",
"jquery": "3.4.1",
"jqvmap": "1.5.1",
diff --git a/pages/_data/libs.json b/pages/_data/libs.json
index f088df092e9fd3a3e6c336e64289d42617231152..18a495059e272452465b98710b53669ef4178e5a 100644
--- a/pages/_data/libs.json
+++ b/pages/_data/libs.json
@@ -7,6 +7,7 @@
"selectize/dist/js/standalone/selectize.min.js",
"apexcharts/dist/apexcharts.min.js",
+ "chart.js/dist/Chart.min.js",
"jqvmap/dist/jquery.vmap.min.js",
"jqvmap/dist/maps/jquery.vmap.world.js",
"jqvmap/dist/maps/jquery.vmap.usa.js",
@@ -16,6 +17,7 @@
],
"css": [
"jqvmap/dist/jqvmap.min.css",
- "selectize/dist/css/selectize.css"
+ "selectize/dist/css/selectize.css",
+ "chart.js/dist/Chart.min.css"
]
}
diff --git a/pages/_includes/js/charts.html b/pages/_includes/js/charts.html
index c93e65fb4133d6eb1ef7528f303b663812c0281e..9a23147074ff78bb118b2476e3cc781366389935 100644
--- a/pages/_includes/js/charts.html
+++ b/pages/_includes/js/charts.html
@@ -1,3 +1,4 @@
+{% capture_global scripts %}
{% removeemptylines %}
{% assign data = site.data.charts[include.chart-id] %}
@@ -127,3 +128,4 @@ document.addEventListener("DOMContentLoaded", function(event) {
{% endif %}
{% endremoveemptylines %}
+{% endcapture_global %}
diff --git a/pages/_includes/ui/avatar.html b/pages/_includes/ui/avatar.html
index ea18bce21584be62ceb6e6e4a7714fafc5799627..687a4c48f29e9a1707a66953baa287cb45df4dfb 100644
--- a/pages/_includes/ui/avatar.html
+++ b/pages/_includes/ui/avatar.html
@@ -17,7 +17,7 @@
{% assign link = include.link | default: false %}
{% assign el = 'span' %}
{% if link %}{% assign el = 'a' %}{% endif %}
-<{{ el }} class="avatar{% if include['size'] %} avatar-{{ include['size'] }}{% endif %}{% if include.thumb %} avatar-thumb{% endif %}{% if include.class %} {{ include.class }}{% endif %}{% if include.shape %} {{ include.shape }}{% endif %}{% if include.color %} bg-{{ include.color }}-lt{% endif %}"{% if src %} style="background-image: url({{ site.base }}{{ src }})"{% endif %}>{% if include.status %}
+<{{ el }} class="avatar{% if include['size'] %} avatar-{{ include['size'] }}{% endif %}{% if include.thumb %} avatar-thumb{% endif %}{% if include.class %} {{ include.class }}{% endif %}{% if include.shape %} {{ include.shape }}{% endif %}{% if include.color %} bg-{{ include.color }}-lt{% endif %}"{% if src %} style="background-image: url({{ site.base }}/{{ src }})"{% endif %}>{% if include.status %}
{% if include.status-text %}{{ include.status-text }}{% elsif include.status-icon %}{% include ui/icon.html icon=include.status-icon class="avatar-status-icon" %}{% endif %}
{% endif %}{% if placeholder %}{{ placeholder }}{% elsif include.icon %} {% include ui/icon.html icon=include.icon class="avatar-icon" %}{% endif %}{{ el }}>
{% endremoveemptylines %}
diff --git a/pages/_layouts/base.html b/pages/_layouts/base.html
index 67724577a1e27a4dff59748a68cba9eea19e3bcf..3db438041fab96e274636722fed7083624e7dff5 100644
--- a/pages/_layouts/base.html
+++ b/pages/_layouts/base.html
@@ -44,6 +44,8 @@
{% endif %}
{% endif %}
+{{ site.capture_global.scripts }}
+