Mirrors/tabler
1
0
Fork 0
mirror of https://github.com/tabler/tabler.git synced 2026-08-21 02:14:26 +04:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
This commit is contained in:
codecalm
2020-02-01 19:30:21 +01:00
parent 33eac63eb6 ac225344e5
commit a1207b7608
2 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
js/tabler.js
+7 -6
View File
@@ -2,7 +2,7 @@
import {Dropdown, Tooltip, Popover} from 'bootstrap'; import {Dropdown, Tooltip, Popover} from 'bootstrap';
import 'popper.js'; import 'popper.js';
// import {CountUp} from "countup.js"; import {CountUp} from "countup.js";
(function () { (function () {
/** /**
@@ -34,9 +34,10 @@ import 'popper.js';
/* /*
CountUp CountUp
*/ */
// let countupTriggerList = [].slice.call(document.querySelectorAll("[data-countup]")); let countupTriggerList = [].slice.call(document.querySelectorAll("[data-countup]"));
// countupTriggerList.map(function (countupTriggerEl) { countupTriggerList.map(function (countupTriggerEl) {
// let dataCountUp = JSON.parse(countupTriggerEl.getAttribute("data-countup")); let dataCountUp;
// return (new CountUp(countupTriggerEl, parseFloat(countupTriggerEl.innerText), dataCountUp)).start(); if(countupTriggerEl.getAttribute("data-countup") != "") dataCountUp = JSON.parse(countupTriggerEl.getAttribute("data-countup"));
// }); return (new CountUp(countupTriggerEl, parseFloat(countupTriggerEl.innerText), dataCountUp)).start();
});
})(); })();
pages/_includes/layout/homepage.html
+3 -3
View File
@@ -35,13 +35,13 @@
{% include cards/project-summary.html title="UI Redesign" date="11 Nov 2019" stage="Final review" avatar-limit=3 avatar-offset=9 project-color="green" value=80 percentage-color="green" %} {% include cards/project-summary.html title="UI Redesign" date="11 Nov 2019" stage="Final review" avatar-limit=3 avatar-offset=9 project-color="green" value=80 percentage-color="green" %}
</div> </div>
<div class="col-6 col-sm-4"> <div class="col-sm-4">
{% include cards/small-stats-3.html number=43 title="New Tickets" percentage=6 %} {% include cards/small-stats-3.html number=43 title="New Tickets" percentage=6 %}
</div> </div>
<div class="col-6 col-sm-4"> <div class="col-sm-4">
{% include cards/small-stats-3.html number=95 number-prefix="$" title="Daily Earnings" percentage=-2 %} {% include cards/small-stats-3.html number=95 number-prefix="$" title="Daily Earnings" percentage=-2 %}
</div> </div>
<div class="col-6 col-sm-4"> <div class="col-sm-4">
{% include cards/small-stats-3.html number=7 title="New Replies" percentage=9 %} {% include cards/small-stats-3.html number=7 title="New Replies" percentage=9 %}
</div> </div>
</div> </div>