Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/dev' into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
codecalm committed Jan 12, 2021
2 parents 057d087 + fba0601 commit 2379606
Show file tree
Hide file tree
Showing 12 changed files with 30 additions and 90 deletions.
3 changes: 0 additions & 3 deletions package.json
Expand Up @@ -87,12 +87,9 @@
"autosize": "^4.0.2",
"bootstrap": "twbs/bootstrap#69afafe8118aa045b1371f93d5a5d5224a9d15dd",
"countup.js": "^2.0.7",
"daterangepicker": "^3.1.0",
"flatpickr": "^4.6.9",
"fullcalendar": "^5.5.0",
"imask": "^6.0.5",
"jquery": "^3.5.1",
"jqvmap": "^1.5.1",
"nouislider": "^14.6.3",
"popper.js": "^1.16.1",
"rollup-plugin-cleanup": "^3.2.1",
Expand Down
6 changes: 0 additions & 6 deletions src/pages/_data/libs.json
Expand Up @@ -8,13 +8,8 @@
},
"js": {
"bootstrap": "bootstrap/dist/js/bootstrap.bundle.min.js",
"jquery": "jquery/dist/jquery.slim.min.js",
"selectize": "selectize/dist/js/standalone/selectize.min.js",
"apexcharts": "apexcharts/dist/apexcharts.min.js",
"jqvmap": "jqvmap/dist/jquery.vmap.min.js",
"jqvmap-world": "jqvmap/dist/maps/jquery.vmap.world.js",
"jqvmap-usa": "jqvmap/dist/maps/jquery.vmap.usa.js",
"jqvmap-europe": "jqvmap/dist/maps/continents/jquery.vmap.europe.js",
"flatpickr": [
"flatpickr/dist/flatpickr.min.js",
"flatpickr/dist/plugins/rangePlugin.js"
Expand All @@ -26,7 +21,6 @@
"google-maps": "https://maps.googleapis.com/maps/api/js?key=GOOGLE_MAPS_KEY"
},
"css": {
"jqvmap": "jqvmap/dist/jqvmap.min.css",
"selectize": "selectize/dist/css/selectize.css",
"flatpickr": "flatpickr/dist/flatpickr.min.css",
"nouislider": "nouislider/distribute/nouislider.min.css",
Expand Down
6 changes: 3 additions & 3 deletions src/pages/_includes/cards/development-activity.html
Expand Up @@ -15,8 +15,8 @@
{% include ui/chart.html chart-id="development-activity" height=12 %}
</div>

<div class="table-responsive">
<table class="table card-table table-vcenter">
<div class="card-table table-responsive">
<table class="table table-vcenter">
<thead>
<tr>
<th>User</th>
Expand All @@ -25,7 +25,7 @@
</tr>
</thead>
<tbody>
{% for commit in site.data.commits limit: 5 %}
{% for commit in site.data.commits limit: 6 %}
<tr>
<td class="w-1">
{% include ui/avatar.html person-id=forloop.index size="sm" %}
Expand Down
2 changes: 1 addition & 1 deletion src/pages/_includes/cards/small-stats.html
Expand Up @@ -5,7 +5,7 @@
<div class="row align-items-center">
{% if include.icon %}
<div class="col-auto">
<span class="{% if include.color %}bg-{{ include.color }} text-white{% endif %} avatar">{% include ui/icon.html icon=include.icon %}</span>
<span class="{% if include.color %}bg-{{ include.color }}{% if include.lt %}-lt{% else %} text-white{% endif %}{% endif %} avatar">{% include ui/icon.html icon=include.icon %}</span>
</div>
{% elsif include.person-id %}
<div class="col-auto">
Expand Down
15 changes: 0 additions & 15 deletions src/pages/_includes/layout/homepage.html
Expand Up @@ -57,21 +57,6 @@ <h3 class="card-title">Traffic summary</h3>
</div>
</div>
</div>
</div>
</div>

<div class="col-lg-6">
{% include cards/map.html title="Top countries" %}
</div>

<div class="col-lg-6">
<div class="row row-cards row-deck">
<div class="col-sm-6">
{% include cards/project-summary.html stage-color="red" %}
</div>
<div class="col-sm-6">
{% 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 class="col-sm-4">
{% include cards/small-stats-3.html number=43 title="New Tickets" percentage=6 %}
Expand Down
2 changes: 1 addition & 1 deletion src/pages/_layouts/homepage.html
Expand Up @@ -4,7 +4,7 @@
page-header: Dashboard
page-header-pretitle: Overview
page-header-actions: buttons
libs: jquery, apexcharts, jqvmap, jqvmap-world
libs: apexcharts
---

{% include layout/homepage.html %}
2 changes: 1 addition & 1 deletion src/pages/form-elements.html
Expand Up @@ -2,7 +2,7 @@
title: Form elements
page-header: Form elements
menu: forms
libs: jquery, nouislider, autosize, selectize, flatpickr, tabler-flags, tabler-payments
libs: nouislider, autosize, selectize, flatpickr, tabler-flags, tabler-payments
---

<div class="row row-cards">
Expand Down
21 changes: 0 additions & 21 deletions src/pages/maps-vector.html

This file was deleted.

14 changes: 6 additions & 8 deletions src/pages/widgets.html
Expand Up @@ -2,7 +2,7 @@
title: Widgets
page-header: Widgets
menu: extra.widgets
libs: jquery, apexcharts
libs: apexcharts
---

<div class="row row-cards">
Expand Down Expand Up @@ -58,13 +58,13 @@
<div class="col-md-6 col-xl-3">{% include cards/small-stats.html id="comments" chart-position="left" chart-type="donut" chart-data="56" color="yellow" title="132 Comments" description="16 waitings" %}
</div>

<div class="col-md-6 col-xl-3">{% include cards/small-stats.html id="sales" icon="arrow-up" color="green-lt" title="$5,256.99" description="Revenue last 30 days" description-value="+4%" %}
<div class="col-md-6 col-xl-3">{% include cards/small-stats.html id="sales" icon="arrow-up" color="green" lt=true title="$5,256.99" description="Revenue last 30 days" description-value="+4%" %}
</div>
<div class="col-md-6 col-xl-3">{% include cards/small-stats.html id="orders" icon="arrow-down" color="red-lt" title="342" description="Sales last 30 days" description-value="-4.3%" description-value-color="red" %}
<div class="col-md-6 col-xl-3">{% include cards/small-stats.html id="orders" icon="arrow-down" color="red" lt=true title="342" description="Sales last 30 days" description-value="-4.3%" description-value-color="red" %}
</div>
<div class="col-md-6 col-xl-3">{% include cards/small-stats.html id="members" icon="arrow-up" color="green-lt" title="132" description="Customers last 30 days" description-value="+6.8%" %}
<div class="col-md-6 col-xl-3">{% include cards/small-stats.html id="members" icon="arrow-up" color="green" lt=true title="132" description="Customers last 30 days" description-value="+6.8%" %}
</div>
<div class="col-md-6 col-xl-3">{% include cards/small-stats.html id="comments" icon="arrow-down" color="red-lt" title="78" description="Members registered today" description-value="-2%" description-value-color="red" %}
<div class="col-md-6 col-xl-3">{% include cards/small-stats.html id="comments" icon="arrow-down" color="red" lt=true title="78" description="Members registered today" description-value="-2%" description-value-color="red" %}
</div>

<div class="col-md-6 col-lg-4">
Expand All @@ -82,9 +82,7 @@
</div>
<div class="col-md-6 col-lg-4">
<div class="row row-cards">
<div class="col-12">{% include cards/small-stats-2.html title="Customers" count="1,950" growth=5.2 color="yellow" %}</div>
<div class="col-12">{% include cards/small-stats-2.html title="Orders" count="8256" growth=0 color="green" %}</div>
<div class="col-12">{% include cards/small-stats-2.html title="Revenue" count="$58,924" growth=-3.1 color="red" light=true %}</div>
<div class="col-12">{% include cards/project-summary.html stage-color="red" %}</div>
</div>
</div>
<div class="col-md-6 col-lg-4">
Expand Down
19 changes: 18 additions & 1 deletion src/scss/_dark.scss
Expand Up @@ -72,7 +72,8 @@

.markdown,
.markdown>*,
.btn-close {
.btn-close,
.accordion-button {
color: inherit;
}

Expand All @@ -87,5 +88,21 @@
.navbar-brand-autodark {
@include autodark-image;
}

.table thead th,
.input-group-text {
background: transparent;
}

.list-group-item,
.form-fieldset,
.selectize-input {
border-color: $input-border-color;
}

.list-group-header {
background: $dark-mode-darken;
border-color: $input-border-color;
}
}

1 change: 0 additions & 1 deletion src/scss/tabler-vendors.scss
@@ -1,7 +1,6 @@
@import "config";

@import "vendor/selectize";
@import "vendor/jqvmap";
@import "vendor/apexcharts";
@import "vendor/fullcalendar";
@import "vendor/flatpickr";
Expand Down
29 changes: 0 additions & 29 deletions src/scss/vendor/_jqvmap.scss

This file was deleted.

0 comments on commit 2379606

Please sign in to comment.