未验证 提交 2a1ea76b 编写于 作者: P Paweł Kuna 提交者: GitHub

Merge pull request #774 from tabler/dev-jquery-remove

...@@ -8,13 +8,8 @@ ...@@ -8,13 +8,8 @@
}, },
"js": { "js": {
"bootstrap": "bootstrap/dist/js/bootstrap.bundle.min.js", "bootstrap": "bootstrap/dist/js/bootstrap.bundle.min.js",
"jquery": "jquery/dist/jquery.slim.min.js",
"selectize": "selectize/dist/js/standalone/selectize.min.js", "selectize": "selectize/dist/js/standalone/selectize.min.js",
"apexcharts": "apexcharts/dist/apexcharts.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": [
"flatpickr/dist/flatpickr.min.js", "flatpickr/dist/flatpickr.min.js",
"flatpickr/dist/plugins/rangePlugin.js" "flatpickr/dist/plugins/rangePlugin.js"
...@@ -26,7 +21,6 @@ ...@@ -26,7 +21,6 @@
"google-maps": "https://maps.googleapis.com/maps/api/js?key=GOOGLE_MAPS_KEY" "google-maps": "https://maps.googleapis.com/maps/api/js?key=GOOGLE_MAPS_KEY"
}, },
"css": { "css": {
"jqvmap": "jqvmap/dist/jqvmap.min.css",
"selectize": "selectize/dist/css/selectize.css", "selectize": "selectize/dist/css/selectize.css",
"flatpickr": "flatpickr/dist/flatpickr.min.css", "flatpickr": "flatpickr/dist/flatpickr.min.css",
"nouislider": "nouislider/distribute/nouislider.min.css", "nouislider": "nouislider/distribute/nouislider.min.css",
......
...@@ -15,8 +15,8 @@ ...@@ -15,8 +15,8 @@
{% include ui/chart.html chart-id="development-activity" height=12 %} {% include ui/chart.html chart-id="development-activity" height=12 %}
</div> </div>
<div class="table-responsive"> <div class="card-table table-responsive">
<table class="table card-table table-vcenter"> <table class="table table-vcenter">
<thead> <thead>
<tr> <tr>
<th>User</th> <th>User</th>
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
{% for commit in site.data.commits limit: 5 %} {% for commit in site.data.commits limit: 6 %}
<tr> <tr>
<td class="w-1"> <td class="w-1">
{% include ui/avatar.html person-id=forloop.index size="sm" %} {% include ui/avatar.html person-id=forloop.index size="sm" %}
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<div class="row align-items-center"> <div class="row align-items-center">
{% if include.icon %} {% if include.icon %}
<div class="col-auto"> <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> </div>
{% elsif include.person-id %} {% elsif include.person-id %}
<div class="col-auto"> <div class="col-auto">
......
...@@ -57,21 +57,6 @@ ...@@ -57,21 +57,6 @@
</div> </div>
</div> </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"> <div class="col-sm-4">
{% include cards/small-stats-3.html number=43 title="New Tickets" percentage=6 %} {% include cards/small-stats-3.html number=43 title="New Tickets" percentage=6 %}
......
...@@ -4,7 +4,7 @@ layout: default ...@@ -4,7 +4,7 @@ layout: default
page-header: Dashboard page-header: Dashboard
page-header-pretitle: Overview page-header-pretitle: Overview
page-header-actions: buttons page-header-actions: buttons
libs: jquery, apexcharts, jqvmap, jqvmap-world libs: apexcharts
--- ---
{% include layout/homepage.html %} {% include layout/homepage.html %}
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
title: Form elements title: Form elements
page-header: Form elements page-header: Form elements
menu: forms 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"> <div class="row row-cards">
......
---
title: Vector Maps
page-header: Vector Maps
menu: base.maps-vector
libs: jquery, jqvmap, jqvmap-world, jqvmap-europe, jqvmap-usa
---
<div class="row row-cards">
{% for map in site.data.maps-vector %}
<div class="col-lg-6">
<div class="card">
<div class="card-body">
<div class="card-title">{{ map[1].title }}</div>
{% assign id = map[0] %}
{% include ui/map-vector.html map-id=id %}
</div>
</div>
</div>
{% endfor %}
</div>
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
title: Widgets title: Widgets
page-header: Widgets page-header: Widgets
menu: extra.widgets menu: extra.widgets
libs: jquery, apexcharts libs: apexcharts
--- ---
<div class="row row-cards"> <div class="row row-cards">
...@@ -58,13 +58,13 @@ libs: jquery, apexcharts ...@@ -58,13 +58,13 @@ libs: jquery, apexcharts
<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 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>
<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>
<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>
<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>
<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>
<div class="col-md-6 col-lg-4"> <div class="col-md-6 col-lg-4">
...@@ -82,9 +82,7 @@ libs: jquery, apexcharts ...@@ -82,9 +82,7 @@ libs: jquery, apexcharts
</div> </div>
<div class="col-md-6 col-lg-4"> <div class="col-md-6 col-lg-4">
<div class="row row-cards"> <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/project-summary.html stage-color="red" %}</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> </div>
</div> </div>
<div class="col-md-6 col-lg-4"> <div class="col-md-6 col-lg-4">
......
@import "config"; @import "config";
@import "vendor/selectize"; @import "vendor/selectize";
@import "vendor/jqvmap";
@import "vendor/apexcharts"; @import "vendor/apexcharts";
@import "vendor/fullcalendar"; @import "vendor/fullcalendar";
@import "vendor/flatpickr"; @import "vendor/flatpickr";
......
.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;
}
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册