diff --git a/package.json b/package.json index 90b3243ab..10139c0c7 100644 --- a/package.json +++ b/package.json @@ -82,7 +82,7 @@ "@fullcalendar/timegrid": "^5.4.0", "apexcharts": "^3.22.2", "autosize": "^4.0.2", - "bootstrap": "twbs/bootstrap#fe961c1", + "bootstrap": "twbs/bootstrap#f4457bc", "countup.js": "^2.0.7", "daterangepicker": "^3.1.0", "flatpickr": "^4.6.6", diff --git a/src/pages/_includes/cards/development-activity.html b/src/pages/_includes/cards/development-activity.html index 23a3c0c77..9f890d9f0 100644 --- a/src/pages/_includes/cards/development-activity.html +++ b/src/pages/_includes/cards/development-activity.html @@ -5,7 +5,7 @@
-
{% include ui/chart-sparkline.html percentage=35 type="donut" %}
+
{% include ui/chart-sparkline.html id="activity" percentage=35 type="donut" %}
Today's Earning: $4,262.40
{% include ui/icon.html icon="trending-up" color="green" class="icon-inline" %} +5% more than yesterday
diff --git a/src/pages/_includes/ui/chart-sparkline.html b/src/pages/_includes/ui/chart-sparkline.html index efe00d826..756d882b4 100644 --- a/src/pages/_includes/ui/chart-sparkline.html +++ b/src/pages/_includes/ui/chart-sparkline.html @@ -1,72 +1,74 @@ {% assign type = include.type | default: 'bar' %} -{% assign id = 0 | random_id %} +{% assign id = include.id %} {% assign color = include.color | default: 'blue' %} {% assign height = include.height | default: 2.5 %} {% assign data = include.data %} -
+{% if id %} +
-{% capture_global scripts %} - -{% endcapture_global %} + {% if type == 'donut' %} + colors: ["{{ color | default: 'blue' | tabler_color }}"], + series: [{{ data }}], + {% else %} + series: [{ + color: "{{ color | default: 'blue' | tabler_color }}", + data: [{{ data }}] + }], + {% endif %} + })).render(); + }); + // @formatter:on + + {% endcapture_global %} +{% endif %} \ No newline at end of file