diff --git a/dist/css/tabler.css.map b/dist/css/tabler.css.map index 79f3635ed..0685904e8 100644 Binary files a/dist/css/tabler.css.map and b/dist/css/tabler.css.map differ diff --git a/package.json b/package.json index adf28aea7..fc135da9c 100644 --- a/package.json +++ b/package.json @@ -110,7 +110,7 @@ "@fullcalendar/timegrid": "4.3.0", "apexcharts": "3.11.2", "autosize": "4.0.2", - "bootstrap": "twbs/bootstrap#c6cfc23", + "bootstrap": "twbs/bootstrap#167a93a", "daterangepicker": "3.0.5", "fullcalendar": "3.10.1", "imask": "5.2.1", diff --git a/pages/_components/card-buttons.html b/pages/_components/card-buttons.html index 5692c01fe..595fb9a75 100644 --- a/pages/_components/card-buttons.html +++ b/pages/_components/card-buttons.html @@ -3,4 +3,4 @@ title: Card with footer buttons columns: 2 --- -{% include cards/card.html title="Card with footer buttons" footer-buttons=true %} +{% include_cached cards/card.html title="Card with footer buttons" footer-buttons=true %} diff --git a/pages/_components/card-comments.html b/pages/_components/card-comments.html index 251603e37..fcff290b4 100644 --- a/pages/_components/card-comments.html +++ b/pages/_components/card-comments.html @@ -3,4 +3,4 @@ title: Comments card columns: 2 --- -{% include cards/comments.html %} +{% include_cached cards/comments.html %} diff --git a/pages/_components/card-tabs-bottom.html b/pages/_components/card-tabs-bottom.html index 7978cc07a..57857123e 100644 --- a/pages/_components/card-tabs-bottom.html +++ b/pages/_components/card-tabs-bottom.html @@ -3,4 +3,4 @@ title: Card with bottom tabs columns: 2 --- -{% include cards/card-tabs.html count=4 bottom=true id="bottom" %} +{% include_cached cards/card-tabs.html count=4 bottom=true id="bottom" %} diff --git a/pages/_components/card-with-image.html b/pages/_components/card-with-image.html index cc56b8342..bc392e708 100644 --- a/pages/_components/card-with-image.html +++ b/pages/_components/card-with-image.html @@ -3,4 +3,4 @@ title: Card with side image columns: 2 --- -{% include cards/card-image.html title="Card with side image" %} +{% include_cached cards/card-image.html title="Card with side image" %} diff --git a/pages/_components/simple-avatar.html b/pages/_components/simple-avatar.html index 1ae634ddb..d9ea2db26 100644 --- a/pages/_components/simple-avatar.html +++ b/pages/_components/simple-avatar.html @@ -3,4 +3,4 @@ title: Simple avatar markdown: false --- -{% include ui/avatar.html person-id=1 status="green" %} +{% include_cached ui/avatar.html person-id=1 status="green" %} diff --git a/pages/_components/simple-card.html b/pages/_components/simple-card.html index 1499d1bc8..768705928 100644 --- a/pages/_components/simple-card.html +++ b/pages/_components/simple-card.html @@ -3,4 +3,4 @@ title: Simple box columns: 1 --- -{% include cards/card.html %} +{% include_cached cards/card.html %} diff --git a/pages/_components/widget-revenue.html b/pages/_components/widget-revenue.html index 1aa376489..8d7798356 100644 --- a/pages/_components/widget-revenue.html +++ b/pages/_components/widget-revenue.html @@ -2,4 +2,4 @@ title: Revenue chart --- -{% include cards/charts/revenue.html %} +{% include_cached cards/charts/revenue.html %} diff --git a/pages/_components/widget-sales.html b/pages/_components/widget-sales.html index 6b76222be..5ba7b3324 100644 --- a/pages/_components/widget-sales.html +++ b/pages/_components/widget-sales.html @@ -3,4 +3,4 @@ title: Sales widget columns: 1 --- -{% include cards/charts/sales.html %} +{% include_cached cards/charts/sales.html %} diff --git a/pages/_data/menu.yml b/pages/_data/menu.yml index 459cb9872..633cf2276 100644 --- a/pages/_data/menu.yml +++ b/pages/_data/menu.yml @@ -52,6 +52,9 @@ base: cards: url: cards.html title: Cards + datatables: + url: datatables.html + title: Data Tables calendar: title: Calendar url: calendar.html @@ -60,12 +63,16 @@ base: url: carousel.html users: title: Users - icon: users url: users.html gallery: title: Gallery - icon: image url: gallery.html + profile: + title: Profile + url: profile.html + music: + title: Music + url: music.html charts: url: charts.html diff --git a/pages/_docs/avatars.md b/pages/_docs/avatars.md index e3ae3ef04..8eeb6f80c 100644 --- a/pages/_docs/avatars.md +++ b/pages/_docs/avatars.md @@ -8,9 +8,9 @@ done: true ### Default markup {% example html wrapper=avatar-list %} -{% include ui/avatar.html person-id=1 %} -{% include ui/avatar.html person-id=2 %} -{% include ui/avatar.html person-id=3 %} +{% include_cached ui/avatar.html person-id=1 %} +{% include_cached ui/avatar.html person-id=2 %} +{% include_cached ui/avatar.html person-id=3 %} {% endexample %} ### Avatar image @@ -18,9 +18,9 @@ done: true Set an image as the background. {% example html wrapper=avatar-list %} -{% include ui/avatar.html person-id=1 %} -{% include ui/avatar.html person-id=3 %} -{% include ui/avatar.html person-id=4 %} +{% include_cached ui/avatar.html person-id=1 %} +{% include_cached ui/avatar.html person-id=3 %} +{% include_cached ui/avatar.html person-id=4 %} {% endexample %} ### Initials @@ -28,11 +28,11 @@ Set an image as the background. You can easily use initials instead of images. {% example html wrapper=avatar-list %} -{% include ui/avatar.html placeholder="AB" %} -{% include ui/avatar.html placeholder="CD" %} -{% include ui/avatar.html placeholder="EF" %} -{% include ui/avatar.html placeholder="GH" %} -{% include ui/avatar.html placeholder="IJ" %} +{% include_cached ui/avatar.html placeholder="AB" %} +{% include_cached ui/avatar.html placeholder="CD" %} +{% include_cached ui/avatar.html placeholder="EF" %} +{% include_cached ui/avatar.html placeholder="GH" %} +{% include_cached ui/avatar.html placeholder="IJ" %} {% endexample %} ### Avatar icons @@ -40,9 +40,9 @@ You can easily use initials instead of images. You can also use icons in avatars. {% example html wrapper=avatar-list %} -{% include ui/avatar.html icon="user" %} -{% include ui/avatar.html icon="plus" %} -{% include ui/avatar.html icon="user-plus" %} +{% include_cached ui/avatar.html icon="user" %} +{% include_cached ui/avatar.html icon="plus" %} +{% include_cached ui/avatar.html icon="user-plus" %} {% endexample %} ### Avatar initials color @@ -50,11 +50,11 @@ You can also use icons in avatars. Customize the color of the avatars' background. You can click [here]({% docs_url colors %}) to see the list of available colors. {% example html wrapper=avatar-list %} -{% include ui/avatar.html placeholder="AB" color="green" %} -{% include ui/avatar.html placeholder="CD" color="red" %} -{% include ui/avatar.html placeholder="EF" color="yellow" %} -{% include ui/avatar.html placeholder="GH" color="blue" %} -{% include ui/avatar.html placeholder="IJ" color="purple" %} +{% include_cached ui/avatar.html placeholder="AB" color="green" %} +{% include_cached ui/avatar.html placeholder="CD" color="red" %} +{% include_cached ui/avatar.html placeholder="EF" color="yellow" %} +{% include_cached ui/avatar.html placeholder="GH" color="blue" %} +{% include_cached ui/avatar.html placeholder="IJ" color="purple" %} {% endexample %} ### Avatar size @@ -62,11 +62,11 @@ Customize the color of the avatars' background. You can click [here]({% docs_url Using Bootstrap’s typical naming structure, you can create a standard avatar, or scale it up to different sizes based on what’s needed. {% example html wrapper=avatar-list %} -{% include ui/avatar.html person-id=10 size="xl" %} -{% include ui/avatar.html person-id=9 size="lg" %} -{% include ui/avatar.html person-id=8 size="md" %} -{% include ui/avatar.html person-id=7 %} -{% include ui/avatar.html person-id=6 size="sm" %} +{% include_cached ui/avatar.html person-id=10 size="xl" %} +{% include_cached ui/avatar.html person-id=9 size="lg" %} +{% include_cached ui/avatar.html person-id=8 size="md" %} +{% include_cached ui/avatar.html person-id=7 %} +{% include_cached ui/avatar.html person-id=6 size="sm" %} {% endexample %} ### Avatar status @@ -74,12 +74,12 @@ Using Bootstrap’s typical naming structure, you can create a standard avatar, Add an online or offline status indicator to show user's availability. {% example html wrapper=avatar-list %} -{% include ui/avatar.html person-id=11 %} -{% include ui/avatar.html person-id=12 status="danger" %} -{% include ui/avatar.html person-id=13 status="success" %} -{% include ui/avatar.html person-id=14 status="warning" %} -{% include ui/avatar.html person-id=15 status="info" %} -{% include ui/avatar.html person-id=16 status="gray" status-text="5" %} +{% include_cached ui/avatar.html person-id=11 %} +{% include_cached ui/avatar.html person-id=12 status="danger" %} +{% include_cached ui/avatar.html person-id=13 status="success" %} +{% include_cached ui/avatar.html person-id=14 status="warning" %} +{% include_cached ui/avatar.html person-id=15 status="info" %} +{% include_cached ui/avatar.html person-id=16 status="gray" status-text="5" %} {% endexample %} ### Avatar shape @@ -87,11 +87,11 @@ Add an online or offline status indicator to show user's availability. Change the shape of an avatar with the default Bootstrap image classes. {% example html wrapper=avatar-list %} -{% include ui/avatar.html person-id=17 %} -{% include ui/avatar.html person-id=18 shape="rounded" %} -{% include ui/avatar.html person-id=19 shape="rounded-circle" %} -{% include ui/avatar.html person-id=20 shape="rounded-0" %} -{% include ui/avatar.html person-id=21 shape="rounded-lg" %} +{% include_cached ui/avatar.html person-id=17 %} +{% include_cached ui/avatar.html person-id=18 shape="rounded" %} +{% include_cached ui/avatar.html person-id=19 shape="rounded-circle" %} +{% include_cached ui/avatar.html person-id=20 shape="rounded-0" %} +{% include_cached ui/avatar.html person-id=21 shape="rounded-lg" %} {% endexample %} ### Avatars list @@ -109,8 +109,8 @@ Make the list stack when it reaches a certain length. {% example %}
| + | No. {% include_cached ui/icon.html icon="chevron-up" class="icon-sm text-dark icon-thick" %} | +Invoice Subject {% include_cached ui/icon.html icon="code" class="icon-sm" %} | +Client {% include_cached ui/icon.html icon="code" class="icon-sm" %} | +VAT No. {% include_cached ui/icon.html icon="code" class="icon-sm" %} | +Created {% include_cached ui/icon.html icon="code" class="icon-sm" %} | +Status {% include_cached ui/icon.html icon="code" class="icon-sm" %} | +Price {% include_cached ui/icon.html icon="code" class="icon-sm" %} | ++ | + | |||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| - | No. | -Invoice Subject | -Client | -VAT No. | -Created | -Status | -Price | -+ | + | 00{{ forloop.index | plus: 1400 }} | +{{ invoice.name }} | ++ {% include ui/flag.html flag=invoice.country %} + {{ invoice.client }} + | ++ {{ invoice.vat-no }} + | ++ {{ invoice.date }} + | ++ {{ invoice.status-name }} + | +{{ invoice.price }} | + ++ + + + {% include ui/dropdown-menu.html %} + + | ++ {% include_cached ui/icon.html icon="edit" class="icon-sm float-right" %} + |
| - | 00{{ forloop.index | plus: 1400 }} | -{{ invoice.name }} | -- {% include ui/flag.html flag=invoice.country %} - {{ invoice.client }} - | -- {{ invoice.vat-no }} - | -- {{ invoice.date }} - | -- {{ invoice.status-name }} - | -{{ invoice.price }} | - -- - - {% include_cached ui/dropdown-menu.html %} - - | -
{{ site.data.people[20].job_title }}
diff --git a/pages/_includes/cards/profile-timeline.html b/pages/_includes/cards/profile-timeline.html index 174983785..efd59766d 100644 --- a/pages/_includes/cards/profile-timeline.html +++ b/pages/_includes/cards/profile-timeline.html @@ -3,20 +3,20 @@Due to: {{ include.date | default: '28 Aug 2019' }}
diff --git a/pages/_includes/cards/small-stats.html b/pages/_includes/cards/small-stats.html index d2aca323d..a305fd246 100644 --- a/pages/_includes/cards/small-stats.html +++ b/pages/_includes/cards/small-stats.html @@ -5,7 +5,7 @@ {% if include.icon %} {% include_cached ui/icon.html icon=include.icon %} {% elsif include.person-id %} - {% include ui/avatar.html person-id=include.person-id class="mr-3 rounded" %} + {% include_cached ui/avatar.html person-id=include.person-id class="mr-3 rounded" %} {% endif %} {% if include.chart-data and chart-position == "left" %} diff --git a/pages/_includes/cards/subscribe.html b/pages/_includes/cards/subscribe.html index 53ca03365..000098d8f 100644 --- a/pages/_includes/cards/subscribe.html +++ b/pages/_includes/cards/subscribe.html @@ -4,7 +4,7 @@
+3 Friend Requests