Merge branch 'dev' into dev-doc-datatables

pages/_includes/cards/charts/active-users.html

@@ -13,6 +13,6 @@
          </div>
       </div>
 
-      {% include ui/chart.html chart-id="active-users" class="chart-sm" %}
+      {% include ui/chart.html chart-id="active-users" size="sm" %}
    </div>
 </div>

pages/_includes/cards/charts/card.html

@@ -1,10 +0,0 @@
-{% assign data = site.data.charts[include.chart-id] %}
-{% assign height = include.height | default: 10 %}
-<div class="card">
-   <div class="card-body">
-      {% if include.title %}
-         <h3 class="card-title">{{ include.title }}</h3>
-      {% endif %}
-      {% include ui/chart.html height=height chart-id=include.chart-id %}
-   </div>
-</div>

pages/_includes/cards/charts/new-clients.html

@@ -13,6 +13,6 @@
          </div>
       </div>
 
-      {% include ui/chart.html chart-id="new-clients" class="chart-sm" %}
+      {% include ui/chart.html chart-id="new-clients" size="sm" %}
    </div>
 </div>

pages/_includes/cards/charts/revenue.html

@@ -13,5 +13,5 @@
          </div>
       </div>
    </div>
-   {% include ui/chart.html chart-id="revenue-bg" class="card-chart" %}
+   {% include ui/chart.html chart-id="revenue-bg" size="sm" %}
 </div>

pages/_includes/cards/charts/total-sales.html

@@ -4,6 +4,6 @@
       <h3 class="card-title">Total sales</h3>
 
       {% include ui/chart.html chart-id="total-sales" height=15 %}
-      {% include ui/chart.html chart-id="total-sales2" height=15 %}
+      {% include ui/chart.html chart-id="campaigns" height=15 %}
    </div>
 </div>

pages/_includes/cards/invoices.html

@@ -2,7 +2,7 @@
       <div class="card-header">
          <h3 class="card-title">Invoices</h3>
       </div>
-      <div class="card-body d-flex justify-content-between flex-nowrap table-responsive border-bottom text-nowrap">
+      <div class="card-body d-flex justify-content-between flex-nowrap table-responsive border-bottom text-nowrap overflow-hidden">
    
          <div class="mb-0">
             Show