diff --git a/_config.yml b/_config.yml index 7d42125d2..11729bb01 100644 --- a/_config.yml +++ b/_config.yml @@ -91,6 +91,9 @@ colors: gray: hex: '#868e96' name: Gray + black: + hex: '#354051' + name: Black variants: [primary, secondary, success, info, warning, danger, dark] socials: [facebook, twitter, google, youtube, vimeo, dribbble, github, instagram, pinterest, vk, rss, flickr, bitbucket] diff --git a/js/app/charts.js b/js/app/charts.js index e73fe1edb..1bb9013d8 100644 --- a/js/app/charts.js +++ b/js/app/charts.js @@ -47,7 +47,9 @@ if (window.Apex) { Apex.grid = { padding: { right: 0, - left: 0 + left: 0, + bottom: 0, + top: 0 } }; @@ -58,9 +60,6 @@ if (window.Apex) { Apex.plotOptions = { pie: { expandOnClick: false, - donut: { - size: '10%' - } }, }; @@ -82,4 +81,8 @@ if (window.Apex) { type: 'solid', opacity: 1 }; + + Apex.legend = { + show: false + }; } diff --git a/pages/_data/charts.yml b/pages/_data/charts.yml index d4a68c98e..7706c8ea3 100644 --- a/pages/_data/charts.yml +++ b/pages/_data/charts.yml @@ -322,6 +322,16 @@ traffic-out: color: red data: [3, 9, 7, 14, 4, 5, 9, 1, 7, 10, 14, 14, 2, 6] +usd-eur: + type: line + days-labels-count: 30 + auto-min: true + stroke-straight: true + series: + - name: USD/EUR + color: black + data: [1.1241, 1.0972, 1.0601, 1.0516, 1.2795, 1.0573, 1.065, 1.1892, 1.1243, 1.1421, 1.1835, 1.1917, 1.1811, 1.1649, 1.1888, 1.1995, 1.2412, 1.2193, 1.2325, 1.2077, 1.1692, 1.168, 1.1686, 1.1601, 1.1608, 1.1317, 1.0318, 1.1465, 1.1444, 1.1371] + devices: type: donut sparkline: true diff --git a/pages/_includes/js/charts.html b/pages/_includes/js/charts.html index 61387537f..7488bc3ac 100644 --- a/pages/_includes/js/charts.html +++ b/pages/_includes/js/charts.html @@ -24,10 +24,15 @@ $(document).ready(function(){ }, {% endif %} - {% if data.dashed-history %} + {% if data.dashed-history or data.stroke-straight %} stroke: { + {% if data.dashed-history %} width: [2, 1], - dashArray: [0, 3], + dashArray: [0, 3], + {% endif %} + {% if data.stroke-straight %} + curve: 'straight', + {% endif %} }, {% endif %} @@ -49,6 +54,12 @@ $(document).ready(function(){ }, {% endif %} + {% if data.auto-min %} + yaxis: { + min: function(min) { return min }, + }, + {% endif %} + {% if data.days-labels-count %} labels: [...Array({{ data.days-labels-count }}).keys()].map(n => `2019-05-${n+1}`), {% endif %} diff --git a/pages/cards-stats.html b/pages/cards-stats.html index cdebf3dc5..daedeffb2 100644 --- a/pages/cards-stats.html +++ b/pages/cards-stats.html @@ -144,6 +144,27 @@ layout: default +
+
+
+
+
USD/EUR
+
+ {% include parts/dropdown/days.html %} +
+
+
+
298
+
+ 4% {% include ui/icon.html icon="trending-up" class="icon-thin" %} +
+
+ +
+ {% include js/charts.html id="chart-usd-eur" chart-id="usd-eur" %} +
+
+
6
7
8