diff --git a/js/tabler-charts.js b/js/tabler-charts.js index 79f2157ac..8d9a34bd1 100644 --- a/js/tabler-charts.js +++ b/js/tabler-charts.js @@ -72,7 +72,6 @@ if (window.Apex) { dataLabels: { enabled: false, - offsetY: -6, dropShadow: { enabled: false, }, @@ -83,7 +82,6 @@ if (window.Apex) { customScale: 1, expandOnClick: false, dataLabels: { - offset: -8, minAngleToShowLabel: 10, }, }, @@ -145,6 +143,12 @@ if (window.Apex) { colors: mutedColor, fontSize: '12px', }, + datetimeFormatter: { + year: 'yyyy', + month: 'MMM \'yy', + day: 'd MMM', + hour: 'HH:mm' + } }, tooltip: { enabled: false, diff --git a/pages/_data/charts.yml b/pages/_data/charts.yml index 75c2c4e2f..dda7bb82e 100644 --- a/pages/_data/charts.yml +++ b/pages/_data/charts.yml @@ -25,14 +25,14 @@ development-activity: type: area groups: [1, 2, 3] hide-points: true - hide-tooltip: true remove-padding: true legend-position: 'top' sparkline: true + days-labels-count: 30 series: - name: 'Purchases' color: blue - data: [0, 5, 1, 2, 7, 5, 6, 8, 24, 7, 12, 5, 6, 3, 2, 2, 6, 30, 10, 10, 15, 14, 47, 65, 55] + data: [3, 5, 4, 6, 7, 5, 6, 8, 24, 7, 12, 5, 6, 3, 8, 4, 14, 30, 17, 19, 15, 14, 25, 32, 40, 55, 60, 48, 52, 70] line: name: Employment Growth @@ -256,6 +256,7 @@ donut: name: Lorem ipsum display: true type: donut + sparkline: true hide-legend: true series: - name: Maximum diff --git a/pages/_includes/cards/small-stats.html b/pages/_includes/cards/small-stats.html index 7c68c4c77..44bb69d0c 100644 --- a/pages/_includes/cards/small-stats.html +++ b/pages/_includes/cards/small-stats.html @@ -1,7 +1,7 @@ {% assign chart-type = include.chart-type | default: 'line' %} {% assign chart-position = include.chart-position | default: 'right' %}
-
+
{% if include.icon %} {% include ui/icon.html icon=include.icon %} {% elsif include.person-id %} @@ -21,7 +21,7 @@ {% include ui/icon.html icon=include.small-icon color=include.color class="icon-sm ml-1" %} {% endif %}
-
{{ include.description | default: "Users" }}
+
{{ include.description | default: "Users" }}
{% if include.second-icon %} diff --git a/pages/_includes/ui/chart.html b/pages/_includes/ui/chart.html index f629620bb..a4cdd0717 100644 --- a/pages/_includes/ui/chart.html +++ b/pages/_includes/ui/chart.html @@ -3,17 +3,17 @@ {% assign height = include.height %} {% if data %} -
+
{% capture_global scripts %} {% endcapture_global %} diff --git a/scss/tabler.scss b/scss/tabler.scss index 1e69217d4..b3f799ca7 100644 --- a/scss/tabler.scss +++ b/scss/tabler.scss @@ -53,6 +53,7 @@ @import "vendor/selectize"; @import "vendor/jqvmap"; @import "vendor/apexcharts"; +@import "vendor/sparkline"; @import "utils/border"; @import "utils/background"; diff --git a/scss/ui/_charts.scss b/scss/ui/_charts.scss index 340be5f55..242dc6b89 100644 --- a/scss/ui/_charts.scss +++ b/scss/ui/_charts.scss @@ -22,54 +22,3 @@ background-size: 14.14px 14.14px; } -.sparkline { - position: relative; - width: 4rem; - height: 2.5rem; - line-height: 1; -} - -.sparkline-square { - width: 2.5rem; -} - -.sparkline-wide { - width: 6rem; -} - -.sparkline-label { - position: absolute; - top: 0; - right: 0; - bottom: 0; - left: 0; - display: flex; - align-items: center; - justify-content: center; - font-size: px2rem(11px); - - .icon { - width: 1rem; - height: 1rem; - } -} - - -// stylelint-disable declaration-no-important -.apexcharts-tooltip { - line-height: 1; - color: #fff; - background: $dark !important; - border: 0 !important; - border-radius: 3px !important; -} - -.apexcharts-tooltip-title { - margin: 0 !important; - background: transparent !important; - border: 0 !important; -} - -.apexcharts-tooltip-series-group { - padding: 0 8px !important; -} diff --git a/scss/vendor/_apexcharts.scss b/scss/vendor/_apexcharts.scss index 02cb07c5f..a403adc3b 100644 --- a/scss/vendor/_apexcharts.scss +++ b/scss/vendor/_apexcharts.scss @@ -1,3 +1,31 @@ .apexcharts-title-text { - font-weight: 600; + font-weight: 600 !important; +} + +.apexcharts-tooltip-title { + font-weight: 600 !important; + padding-bottom: .25rem !important; +} + +.apexcharts-tooltip { + line-height: 1; + color: #fff; + background: $dark !important; + border: 0 !important; + border-radius: 3px !important; +} + +.apexcharts-tooltip-title { + margin: 0 !important; + background: transparent !important; + border: 0 !important; +} + +.apexcharts-tooltip-series-group { + padding: 0 8px !important; +} + +.apexcharts-tooltip-marker { + width: .5rem; + height: .5rem; } diff --git a/scss/vendor/_sparkline.scss b/scss/vendor/_sparkline.scss new file mode 100644 index 000000000..54b97a997 --- /dev/null +++ b/scss/vendor/_sparkline.scss @@ -0,0 +1,31 @@ +.sparkline { + position: relative; + width: 4rem; + height: 2.5rem; + line-height: 1; +} + +.sparkline-square { + width: 2.5rem; +} + +.sparkline-wide { + width: 6rem; +} + +.sparkline-label { + position: absolute; + top: 0; + right: 0; + bottom: 0; + left: 0; + display: flex; + align-items: center; + justify-content: center; + font-size: px2rem(11px); + + .icon { + width: 1rem; + height: 1rem; + } +} diff --git a/static/img/products/product-1.jpg b/static/img/products/product-1.jpg new file mode 100644 index 000000000..a4a54885c Binary files /dev/null and b/static/img/products/product-1.jpg differ diff --git a/static/img/products/product-10.jpg b/static/img/products/product-10.jpg new file mode 100644 index 000000000..4c1934039 Binary files /dev/null and b/static/img/products/product-10.jpg differ diff --git a/static/img/products/product-11.jpg b/static/img/products/product-11.jpg new file mode 100644 index 000000000..4a4c86824 Binary files /dev/null and b/static/img/products/product-11.jpg differ diff --git a/static/img/products/product-12.jpg b/static/img/products/product-12.jpg new file mode 100644 index 000000000..0c81300d3 Binary files /dev/null and b/static/img/products/product-12.jpg differ diff --git a/static/img/products/product-13.jpg b/static/img/products/product-13.jpg new file mode 100644 index 000000000..b99cca788 Binary files /dev/null and b/static/img/products/product-13.jpg differ diff --git a/static/img/products/product-2.jpg b/static/img/products/product-2.jpg new file mode 100644 index 000000000..c2170aaa9 Binary files /dev/null and b/static/img/products/product-2.jpg differ diff --git a/static/img/products/product-4.jpg b/static/img/products/product-4.jpg new file mode 100644 index 000000000..96b6c3295 Binary files /dev/null and b/static/img/products/product-4.jpg differ diff --git a/static/img/products/product-5.jpg b/static/img/products/product-5.jpg new file mode 100644 index 000000000..c7e26d8a6 Binary files /dev/null and b/static/img/products/product-5.jpg differ diff --git a/static/img/products/product-6.jpg b/static/img/products/product-6.jpg new file mode 100644 index 000000000..ce4100048 Binary files /dev/null and b/static/img/products/product-6.jpg differ diff --git a/static/img/products/product-7.jpg b/static/img/products/product-7.jpg new file mode 100644 index 000000000..602a3ece2 Binary files /dev/null and b/static/img/products/product-7.jpg differ diff --git a/static/img/products/product-8.jpg b/static/img/products/product-8.jpg new file mode 100644 index 000000000..4cab98701 Binary files /dev/null and b/static/img/products/product-8.jpg differ diff --git a/static/img/products/product-9.jpg b/static/img/products/product-9.jpg new file mode 100644 index 000000000..350de4223 Binary files /dev/null and b/static/img/products/product-9.jpg differ