From c6070021bfb8f95ced0b47d0260efc556afbfafa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Balicki?= Date: Wed, 6 Jan 2021 19:32:05 +0100 Subject: [PATCH 1/3] Some dark theme fixes --- src/scss/_dark.scss | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/src/scss/_dark.scss b/src/scss/_dark.scss index cfbc88b3ef..fc7c32aa59 100644 --- a/src/scss/_dark.scss +++ b/src/scss/_dark.scss @@ -72,7 +72,8 @@ .markdown, .markdown>*, - .btn-close { + .btn-close, + .accordion-button { color: inherit; } @@ -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; + } } From 0624af8bac9426909e4d6fe73e5e651cc9510f54 Mon Sep 17 00:00:00 2001 From: codecalm Date: Tue, 12 Jan 2021 20:58:47 +0100 Subject: [PATCH 2/3] Remove jQuery dependencies --- package.json | 3 -- src/pages/_data/libs.json | 6 ---- .../_includes/cards/development-activity.html | 6 ++-- src/pages/_includes/cards/small-stats.html | 2 +- src/pages/_includes/layout/homepage.html | 15 ---------- src/pages/_layouts/homepage.html | 2 +- src/pages/form-elements.html | 2 +- src/pages/maps-vector.html | 21 -------------- src/pages/widgets.html | 11 +++---- src/scss/tabler-vendors.scss | 1 - src/scss/vendor/_jqvmap.scss | 29 ------------------- 11 files changed, 12 insertions(+), 86 deletions(-) delete mode 100644 src/pages/maps-vector.html delete mode 100644 src/scss/vendor/_jqvmap.scss diff --git a/package.json b/package.json index 0d9a9ab00e..9155da9bff 100644 --- a/package.json +++ b/package.json @@ -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", diff --git a/src/pages/_data/libs.json b/src/pages/_data/libs.json index e5a7dbf656..3cbf59d9aa 100644 --- a/src/pages/_data/libs.json +++ b/src/pages/_data/libs.json @@ -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" @@ -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", diff --git a/src/pages/_includes/cards/development-activity.html b/src/pages/_includes/cards/development-activity.html index 9f890d9f0d..8c5398f48f 100644 --- a/src/pages/_includes/cards/development-activity.html +++ b/src/pages/_includes/cards/development-activity.html @@ -15,8 +15,8 @@ {% include ui/chart.html chart-id="development-activity" height=12 %} -
- +
+
@@ -25,7 +25,7 @@ - {% for commit in site.data.commits limit: 5 %} + {% for commit in site.data.commits limit: 6 %}
User
{% include ui/avatar.html person-id=forloop.index size="sm" %} diff --git a/src/pages/_includes/cards/small-stats.html b/src/pages/_includes/cards/small-stats.html index 9653552e53..a7d15e5521 100644 --- a/src/pages/_includes/cards/small-stats.html +++ b/src/pages/_includes/cards/small-stats.html @@ -5,7 +5,7 @@
{% if include.icon %}
- {% include ui/icon.html icon=include.icon %} + {% include ui/icon.html icon=include.icon %}
{% elsif include.person-id %}
diff --git a/src/pages/_includes/layout/homepage.html b/src/pages/_includes/layout/homepage.html index 78e8567707..126e8b00d7 100644 --- a/src/pages/_includes/layout/homepage.html +++ b/src/pages/_includes/layout/homepage.html @@ -57,21 +57,6 @@

Traffic summary

- - - -
- {% include cards/map.html title="Top countries" %} -
- -
-
-
- {% include cards/project-summary.html stage-color="red" %} -
-
- {% 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/small-stats-3.html number=43 title="New Tickets" percentage=6 %} diff --git a/src/pages/_layouts/homepage.html b/src/pages/_layouts/homepage.html index 4efa7f4b1a..7f86f8b39c 100644 --- a/src/pages/_layouts/homepage.html +++ b/src/pages/_layouts/homepage.html @@ -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 %} diff --git a/src/pages/form-elements.html b/src/pages/form-elements.html index 1c0494d683..47393ab7aa 100644 --- a/src/pages/form-elements.html +++ b/src/pages/form-elements.html @@ -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 ---
diff --git a/src/pages/maps-vector.html b/src/pages/maps-vector.html deleted file mode 100644 index 3872be0003..0000000000 --- a/src/pages/maps-vector.html +++ /dev/null @@ -1,21 +0,0 @@ ---- -title: Vector Maps -page-header: Vector Maps -menu: base.maps-vector -libs: jquery, jqvmap, jqvmap-world, jqvmap-europe, jqvmap-usa ---- - -
- {% for map in site.data.maps-vector %} -
- -
-
-
{{ map[1].title }}
- {% assign id = map[0] %} - {% include ui/map-vector.html map-id=id %} -
-
-
- {% endfor %} -
diff --git a/src/pages/widgets.html b/src/pages/widgets.html index f63ba18eb1..8dd8175916 100644 --- a/src/pages/widgets.html +++ b/src/pages/widgets.html @@ -2,7 +2,7 @@ title: Widgets page-header: Widgets menu: extra.widgets -libs: jquery, apexcharts +libs: apexcharts ---
@@ -58,13 +58,13 @@
{% include cards/small-stats.html id="comments" chart-position="left" chart-type="donut" chart-data="56" color="yellow" title="132 Comments" description="16 waitings" %}
-
{% 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%" %} +
{% 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%" %}
-
{% 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" %} +
{% 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" %}
-
{% include cards/small-stats.html id="members" icon="arrow-up" color="green-lt" title="132" description="Customers last 30 days" description-value="+6.8%" %} +
{% 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%" %}
-
{% 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" %} +
{% 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" %}
@@ -82,6 +82,7 @@
+
{% include cards/project-summary.html stage-color="red" %}
{% include cards/small-stats-2.html title="Customers" count="1,950" growth=5.2 color="yellow" %}
{% include cards/small-stats-2.html title="Orders" count="8256" growth=0 color="green" %}
{% include cards/small-stats-2.html title="Revenue" count="$58,924" growth=-3.1 color="red" light=true %}
diff --git a/src/scss/tabler-vendors.scss b/src/scss/tabler-vendors.scss index 08b27c2361..21407d94d7 100644 --- a/src/scss/tabler-vendors.scss +++ b/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"; diff --git a/src/scss/vendor/_jqvmap.scss b/src/scss/vendor/_jqvmap.scss deleted file mode 100644 index 6d5b0c7786..0000000000 --- a/src/scss/vendor/_jqvmap.scss +++ /dev/null @@ -1,29 +0,0 @@ -.jqvmap-zoomin, -.jqvmap-zoomout { - height: 1.5rem; - width: 1.5rem; - left: .5rem; - border: 1px solid $border-color; - background: $white; - color: $body-color; - display: flex; - align-items: center; - justify-content: center; - line-height: 1; -} - -.jqvmap-zoomin { - top: .5rem; -} - -.jqvmap-zoomout { - top: 2.5rem; -} - -.jqvmap-label { - font-family: inherit; - font-size: $h6-font-size; - line-height: 1; - padding: .25rem; - background: $dark; -} From 3bd078d69843bfcba6dc0d00fd15385365e1e08c Mon Sep 17 00:00:00 2001 From: codecalm Date: Tue, 12 Jan 2021 20:59:49 +0100 Subject: [PATCH 3/3] Remove unused widgets --- src/pages/widgets.html | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/pages/widgets.html b/src/pages/widgets.html index 8dd8175916..e218d7d907 100644 --- a/src/pages/widgets.html +++ b/src/pages/widgets.html @@ -83,9 +83,6 @@
{% include cards/project-summary.html stage-color="red" %}
-
{% include cards/small-stats-2.html title="Customers" count="1,950" growth=5.2 color="yellow" %}
-
{% include cards/small-stats-2.html title="Orders" count="8256" growth=0 color="green" %}
-
{% include cards/small-stats-2.html title="Revenue" count="$58,924" growth=-3.1 color="red" light=true %}