diff --git a/Gemfile b/Gemfile index ede8efea1..c6784b71a 100644 --- a/Gemfile +++ b/Gemfile @@ -7,7 +7,6 @@ group :jekyll_plugins do gem "jekyll-tidy" gem "jekyll-timeago" gem 'jekyll-redirect-from' - gem 'jekyll-include-cache' end gem 'wdm', '>= 0.1.1' if Gem.win_platform? diff --git a/README.md b/README.md index 67d682270..a7b5d4657 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ Premium and Open Source dashboard template with responsive and high-quality UI. [![Sponsors on Open Collective](https://opencollective.com/tabler/sponsors/badge.svg)](#sponsors) -View Demo | View React Version | Download ZIP | Join us on Slack +View Demo | View React Version | Download ZIP | Join us on Slack ![Tabler preview](https://raw.githubusercontent.com/tabler/tabler/dev/static/img/tabler-preview.png) diff --git a/_config.yml b/_config.yml index 679cc4bba..a591934ea 100644 --- a/_config.yml +++ b/_config.yml @@ -15,7 +15,6 @@ plugins: - jekyll-tidy - jekyll-timeago - jekyll-redirect-from -- jekyll-include-cache exclude: - .jekyll-cache diff --git a/package.json b/package.json index fc135da9c..6a9f5724c 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#167a93a", + "bootstrap": "twbs/bootstrap#e2530d3", "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 595fb9a75..5692c01fe 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_cached cards/card.html title="Card with footer buttons" footer-buttons=true %} +{% include 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 fcff290b4..251603e37 100644 --- a/pages/_components/card-comments.html +++ b/pages/_components/card-comments.html @@ -3,4 +3,4 @@ title: Comments card columns: 2 --- -{% include_cached cards/comments.html %} +{% include cards/comments.html %} diff --git a/pages/_components/card-ribbon.html b/pages/_components/card-ribbon.html index a504d74a0..e2db82af5 100644 --- a/pages/_components/card-ribbon.html +++ b/pages/_components/card-ribbon.html @@ -3,4 +3,4 @@ title: Card with ribbon columns: 1 --- -{% include_cached cards/ribbon.html right=true text="-10%" lorem=true color="orange" bookmark=true %} +{% include cards/ribbon.html right=true text="-10%" lorem=true color="orange" bookmark=true %} diff --git a/pages/_components/card-tabs-bottom.html b/pages/_components/card-tabs-bottom.html index 57857123e..7978cc07a 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_cached cards/card-tabs.html count=4 bottom=true id="bottom" %} +{% include 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 bc392e708..cc56b8342 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_cached cards/card-image.html title="Card with side image" %} +{% include cards/card-image.html title="Card with side image" %} diff --git a/pages/_components/simple-avatar.html b/pages/_components/simple-avatar.html index d9ea2db26..1ae634ddb 100644 --- a/pages/_components/simple-avatar.html +++ b/pages/_components/simple-avatar.html @@ -3,4 +3,4 @@ title: Simple avatar markdown: false --- -{% include_cached ui/avatar.html person-id=1 status="green" %} +{% include ui/avatar.html person-id=1 status="green" %} diff --git a/pages/_components/simple-card.html b/pages/_components/simple-card.html index 768705928..1499d1bc8 100644 --- a/pages/_components/simple-card.html +++ b/pages/_components/simple-card.html @@ -3,4 +3,4 @@ title: Simple box columns: 1 --- -{% include_cached cards/card.html %} +{% include cards/card.html %} diff --git a/pages/_components/widget-revenue.html b/pages/_components/widget-revenue.html index 8d7798356..1aa376489 100644 --- a/pages/_components/widget-revenue.html +++ b/pages/_components/widget-revenue.html @@ -2,4 +2,4 @@ title: Revenue chart --- -{% include_cached cards/charts/revenue.html %} +{% include cards/charts/revenue.html %} diff --git a/pages/_components/widget-sales.html b/pages/_components/widget-sales.html index 5ba7b3324..6b76222be 100644 --- a/pages/_components/widget-sales.html +++ b/pages/_components/widget-sales.html @@ -3,4 +3,4 @@ title: Sales widget columns: 1 --- -{% include_cached cards/charts/sales.html %} +{% include cards/charts/sales.html %} diff --git a/pages/_data/selects.yml b/pages/_data/selects.yml index 9bcc49620..8d5480145 100644 --- a/pages/_data/selects.yml +++ b/pages/_data/selects.yml @@ -11,6 +11,7 @@ users: name: Nikola Tesla tags: + max-items: 3 value: dev, test options: - dev @@ -22,16 +23,16 @@ countries: options: pl: name: Poland - image: img/flags/pl.svg + flag: pl de: name: Germany - image: img/flags/de.svg + flag: de cz: name: Czech Republic - image: img/flags/cz.svg + flag: cz br: name: Brazil - image: img/flags/br.svg + flag: br people: value: 4 diff --git a/pages/_docs/avatars.md b/pages/_docs/avatars.md index 8eeb6f80c..4bc0f64bb 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_cached ui/avatar.html person-id=1 %} -{% include_cached ui/avatar.html person-id=2 %} -{% include_cached ui/avatar.html person-id=3 %} +{% include ui/avatar.html person-id=1 %} +{% include ui/avatar.html person-id=2 %} +{% include 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_cached ui/avatar.html person-id=1 %} -{% include_cached ui/avatar.html person-id=3 %} -{% include_cached ui/avatar.html person-id=4 %} +{% include ui/avatar.html person-id=1 %} +{% include ui/avatar.html person-id=3 %} +{% include 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_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" %} +{% 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" %} {% 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_cached ui/avatar.html icon="user" %} -{% include_cached ui/avatar.html icon="plus" %} -{% include_cached ui/avatar.html icon="user-plus" %} +{% include ui/avatar.html icon="user" %} +{% include ui/avatar.html icon="plus" %} +{% include 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_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" %} +{% 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" %} {% 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_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" %} +{% 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" %} {% 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_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" %} +{% 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" %} {% 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_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" %} +{% 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" %} {% endexample %} ### Avatars list @@ -109,7 +109,7 @@ Make the list stack when it reaches a certain length. {% example %}
{% for person in site.data.people limit: 5 offset: 30 %} - {% include_cached ui/avatar.html person=person element="a" %} + {% include ui/avatar.html person=person element="a" %} {% endfor %} +8
diff --git a/pages/_docs/buttons.md b/pages/_docs/buttons.md index 99a51bf66..06b6c272b 100644 --- a/pages/_docs/buttons.md +++ b/pages/_docs/buttons.md @@ -27,7 +27,7 @@ Use any of the available button classes to quickly create a styled button . We p {% for button in site.button-variants %} {% assign btn-color = button[1].class %} {% assign btn-title = button[1].title %} -{% include_cached ui/button.html color=btn-color text=btn-title %} +{% include ui/button.html color=btn-color text=btn-title %} {% endfor %} {% endexample %} @@ -39,7 +39,7 @@ Make buttons look inactive by adding the disabled boolean attribute to any `.btn {% for button in site.button-variants %} {% assign btn-color = button[1].class %} {% assign btn-title = button[1].title %} -{% include_cached ui/button.html color=btn-color text=btn-title disabled=true %} +{% include ui/button.html color=btn-color text=btn-title disabled=true %} {% endfor %} {% endexample %} @@ -62,7 +62,7 @@ Add `.btn-square` to button to remove border-radius. {% for button in site.button-variants %} {% assign btn-color = button[1].class %} {% assign btn-title = button[1].title %} -{% include_cached ui/button.html color=btn-color text=btn-title square=true %} +{% include ui/button.html color=btn-color text=btn-title square=true %} {% endfor %} {% endexample %} @@ -74,7 +74,7 @@ Add `.btn-pill` class to any button to make them more rounded. {% for button in site.button-variants %} {% assign btn-color = button[1].class %} {% assign btn-title = button[1].title %} -{% include_cached ui/button.html color=btn-color text=btn-title pill=true %} +{% include ui/button.html color=btn-color text=btn-title pill=true %} {% endfor %} {% endexample %} @@ -86,7 +86,7 @@ In need of a button, but not the hefty background colors they bring? Replace the {% for button in site.button-variants %} {% assign btn-color = button[1].class %} {% assign btn-title = button[1].title %} -{% include_cached ui/button.html text=btn-title color=btn-color outline=true %} +{% include ui/button.html text=btn-title color=btn-color outline=true %} {% endfor %} {% endexample %} @@ -119,27 +119,27 @@ Icons can be found [**here**](/docs/icons.html#icons) {% example html wrapper=btn-list %} {% endexample %} @@ -153,7 +153,7 @@ A button can be formatted to link to a social website {% assign btn-icon = button[1].icon %} {% assign btn-title = button[1].title %} {% assign btn-color = button[0] %} -{% include_cached ui/button.html color=btn-color icon=btn-icon text=btn-title %} +{% include ui/button.html color=btn-color icon=btn-icon text=btn-title %} {% endfor %} {% endexample %} @@ -163,7 +163,7 @@ You can use only icons. {% for button in site.socials %} {% assign btn-icon = button[1].icon %} {% assign btn-color = button[0] %} -{% include_cached ui/button.html color=btn-color icon=btn-icon icon-only=true %} +{% include ui/button.html color=btn-color icon=btn-icon icon-only=true %} {% endfor %} {% endexample %} @@ -173,25 +173,25 @@ Icon only button. Add `.btn-icon` class to remove unnecessary padding from butto {% example html wrapper=btn-list %} {% endexample %} @@ -202,23 +202,23 @@ Wrap the dropdown’s toggle (your button or link) and the dropdown menu within {% example html wrapper=btn-list %}
- {% include_cached ui/dropdown-menu.html %} + {% include ui/dropdown-menu.html %}
- {% include_cached ui/dropdown-menu.html %} + {% include ui/dropdown-menu.html %}
- {% include_cached ui/dropdown-menu.html %} + {% include ui/dropdown-menu.html %}
{% endexample %} @@ -229,7 +229,7 @@ Add `.btn-loading` to use a loading state on a button. The width of the button d Since the loading spinner is implemented using the `:after` pseudo-element, it is not supported by the `` element. {% example html wrapper=btn-list %} -{% include_cached ui/button.html color="primary" text="Button" spinner=true %} +{% include ui/button.html color="primary" text="Button" spinner=true %} {% endexample %} ### List of buttons @@ -290,13 +290,13 @@ Use the `.text-center` or the `.text-right` modifiers to alter the alignment. {% example html wrapper=btn-list %} - {% include_cached ui/avatar.html person-id="4" %} Avatar + {% include ui/avatar.html person-id="4" %} Avatar - {% include_cached ui/avatar.html person-id="5" %} Avatar + {% include ui/avatar.html person-id="5" %} Avatar - {% include_cached ui/avatar.html person-id="6" %} Avatar + {% include ui/avatar.html person-id="6" %} Avatar {% endexample %} diff --git a/pages/_docs/cards.md b/pages/_docs/cards.md index 186e5ed26..0e2810d7c 100644 --- a/pages/_docs/cards.md +++ b/pages/_docs/cards.md @@ -11,20 +11,20 @@ The `.card` element is simply a container with a shadow, a border, a radius, and ### Default card {% example html columns=1 %} -{% include_cached cards/card.html body="This is some text within a card body." %} +{% include cards/card.html body="This is some text within a card body." %} {% endexample %} ### Card with title and image {% example html columns=1 %} -{% include_cached cards/card.html img-top=true title="Card with title and image" %} +{% include cards/card.html img-top=true title="Card with title and image" %} {% endexample %} ### Blog post card The best way to make your post eye-catching is adding an image to it. To do so, just add the image with the `.card-img-top` class. We've added the `.d-flex .flex-column` classes to the `.card-body` to have the author details be on the bottom of the card. {% example html columns=1 %} -{% include_cached cards/blog-single.html type="image" %} +{% include cards/blog-single.html type="image" %} {% endexample %} ### Row deck @@ -56,7 +56,7 @@ If you want to create a couple of posts next to each other, add the `.row-deck` You can also add the image on the left side of the card. All you need do to is: add the `.card-aside` class to the element with the `.card` class. Then add the image in the `.card-aside-column` element. No worries, tabler will automatically center it and scale to right size: {% example html columns=3 %} -{% include_cached cards/blog-single.html type="aside" liked=1 article-id=3 %} +{% include cards/blog-single.html type="aside" liked=1 article-id=3 %} {% endexample %} ### Color variations @@ -64,10 +64,10 @@ You can also add the image on the left side of the card. All you need do to is: {% example html columns=3 %}
- {% include_cached cards/card.html status-top="danger" title="Card with top status" %} + {% include cards/card.html status-top="danger" title="Card with top status" %}
- {% include_cached cards/card.html status-left="green" title="Card with side status" %} + {% include cards/card.html status-left="green" title="Card with side status" %}
{% endexample %} @@ -75,12 +75,12 @@ You can also add the image on the left side of the card. All you need do to is: ### Stacked card {% example html columns=1 %} -{% include_cached cards/card.html class="card-stacked" title="Stacked card" %} +{% include cards/card.html class="card-stacked" title="Stacked card" %} {% endexample %} ## Tabbed card {% example html columns=2 %} -{% include_cached cards/card-tabs.html count=4 %} +{% include cards/card-tabs.html count=4 %} {% endexample %} diff --git a/pages/_docs/ribbons.md b/pages/_docs/ribbons.md index 502050e37..ab1b4e68e 100644 --- a/pages/_docs/ribbons.md +++ b/pages/_docs/ribbons.md @@ -7,7 +7,7 @@ done: true ### Default markup {% example html columns=1 %} -{% include_cached cards/ribbon.html %} +{% include cards/ribbon.html %} {% endexample %} ### Ribbon position @@ -22,7 +22,7 @@ You can easily change the position of a ribbon by adding a class to the element. You can also use multiple classes at once for example: `.ribbon.ribbon-top.ribbon-left` moves the ribbon to the top left corner. {% example html columns=1 %} -{% include_cached cards/ribbon.html top=true left=true %} +{% include cards/ribbon.html top=true left=true %} {% endexample %} ### Ribbon color @@ -30,7 +30,7 @@ You can also use multiple classes at once for example: `.ribbon.ribbon-top.ribbo Customize the ribbon's background color. You can click [here]({% docs_url colors %}) to see the list of available colors. {% example html columns=1 %} -{% include_cached cards/ribbon.html color="red" %} +{% include cards/ribbon.html color="red" %} {% endexample %} ### Ribbon text @@ -38,7 +38,7 @@ Customize the ribbon's background color. You can click [here]({% docs_url colors Set your own text in a ribbon. {% example html columns=1 %} -{% include_cached cards/ribbon.html color="green" text="-50%" %} +{% include cards/ribbon.html color="green" text="-50%" %} {% endexample %} ### Ribbon style @@ -46,5 +46,5 @@ Set your own text in a ribbon. Change the style of a ribbon. {% example html columns=1 %} -{% include_cached cards/ribbon.html bookmark=true color="orange" text="-50%" %} +{% include cards/ribbon.html bookmark=true color="orange" text="-50%" %} {% endexample %} diff --git a/pages/_docs/spinners.md b/pages/_docs/spinners.md index 4f216ba7b..029c50231 100644 --- a/pages/_docs/spinners.md +++ b/pages/_docs/spinners.md @@ -44,9 +44,9 @@ done: true ### Buttons {% example html wrapper=btn-list %} -{% include_cached ui/button.html spinner=true text="Button" color="primary" %} -{% include_cached ui/button.html spinner=true text="Button" color="danger" %} -{% include_cached ui/button.html spinner=true text="Button" color="warning" %} -{% include_cached ui/button.html spinner=true color="success" %} -{% include_cached ui/button.html spinner=true color="secondary" %} +{% include ui/button.html spinner=true text="Button" color="primary" %} +{% include ui/button.html spinner=true text="Button" color="danger" %} +{% include ui/button.html spinner=true text="Button" color="warning" %} +{% include ui/button.html spinner=true color="success" %} +{% include ui/button.html spinner=true color="secondary" %} {% endexample %} diff --git a/pages/_docs/tabs.md b/pages/_docs/tabs.md index f534bdf43..fe5a82de2 100644 --- a/pages/_docs/tabs.md +++ b/pages/_docs/tabs.md @@ -7,35 +7,35 @@ bootstrap-link: components/navs/ ### Default markup {% example html columns=1 %} -{% include_cached cards/tabs.html id="ex1" %} +{% include cards/tabs.html id="ex1" %} {% endexample %} ### Tabs with icons {% example html columns=1 %} -{% include_cached cards/tabs.html icons=true settings=true id="ex2" %} +{% include cards/tabs.html icons=true settings=true id="ex2" %} {% endexample %} ### Tabs only with icons {% example html columns=1 %} -{% include_cached cards/tabs.html icons=true settings=true hide-text=true id="ex3" %} +{% include cards/tabs.html icons=true settings=true hide-text=true id="ex3" %} {% endexample %} ### Tabs with dropdown {% example html columns=1 %} -{% include_cached cards/tabs.html dropdown=true id="ex4" %} +{% include cards/tabs.html dropdown=true id="ex4" %} {% endexample %} ### Full-width tabs {% example html columns=1 %} -{% include_cached cards/tabs.html justified=true icons=true hide-text=true activity=true id="ex5" %} +{% include cards/tabs.html justified=true icons=true hide-text=true activity=true id="ex5" %} {% endexample %} ### Alternate style {% example html columns=1 %} -{% include_cached cards/tabs.html icons=true alternative=true settings=true id="ex6" %} +{% include cards/tabs.html icons=true alternative=true settings=true id="ex6" %} {% endexample %} diff --git a/pages/_docs/timelines.md b/pages/_docs/timelines.md index 01dd7ec5b..131d45203 100644 --- a/pages/_docs/timelines.md +++ b/pages/_docs/timelines.md @@ -5,10 +5,10 @@ menu: docs.timelines ### Timeline {% example html columns=3 %} - {% include_cached cards/timeline.html %} + {% include cards/timeline.html %} {% endexample %} ### Simple Timeline {% example html columns=1 %} - {% include_cached cards/timeline.html simple=true %} + {% include cards/timeline.html simple=true %} {% endexample %} diff --git a/pages/_includes/cards/blog-single.html b/pages/_includes/cards/blog-single.html index 78300b9b9..398c5f121 100644 --- a/pages/_includes/cards/blog-single.html +++ b/pages/_includes/cards/blog-single.html @@ -12,14 +12,14 @@
{{ article.description | truncate: truncate }}
- {% include_cached ui/avatar.html person-id=avatar size="md" %} + {% include ui/avatar.html person-id=avatar size="md" %}
{{ author.first_name }} {{ author.last_name }} 3 days ago
- {% include_cached ui/icon.html icon="heart" use-svg=true %} + {% include ui/icon.html icon="heart" use-svg=true %}
diff --git a/pages/_includes/cards/card-group.html b/pages/_includes/cards/card-group.html index 881b8cd43..68f58b75f 100644 --- a/pages/_includes/cards/card-group.html +++ b/pages/_includes/cards/card-group.html @@ -1,5 +1,5 @@
- {% include_cached cards/card.html link=true class="text-center" body="This is first card" inactive=true %} - {% include_cached cards/card.html link=true class="text-center" body="This is second card" active=true %} - {% include_cached cards/card.html link=true class="text-center" body="This is third card" %} + {% include cards/card.html link=true class="text-center" body="This is first card" inactive=true %} + {% include cards/card.html link=true class="text-center" body="This is second card" active=true %} + {% include cards/card.html link=true class="text-center" body="This is third card" %}
diff --git a/pages/_includes/cards/comments.html b/pages/_includes/cards/comments.html index e57da1639..9cc58e79c 100644 --- a/pages/_includes/cards/comments.html +++ b/pages/_includes/cards/comments.html @@ -7,7 +7,7 @@ {% for person in site.data.people limit: 3 %}
- {% include_cached ui/avatar.html person=person status="green" %} + {% include ui/avatar.html person=person status="green" %}
@@ -21,9 +21,9 @@

+{{ forloop.index | random_number: 20, 50 }} - {% include_cached ui/icon.html icon="chevron-up" %} + {% include ui/icon.html icon="chevron-up" %} - {% include_cached ui/icon.html icon="chevron-down" %} + {% include ui/icon.html icon="chevron-down" %} · Reply diff --git a/pages/_includes/cards/company-employees.html b/pages/_includes/cards/company-employees.html index 4b1b85ad3..18c2aba89 100644 --- a/pages/_includes/cards/company-employees.html +++ b/pages/_includes/cards/company-employees.html @@ -12,7 +12,7 @@ {% for person in site.data.people limit: 5 offset: 20 %} - {% include_cached ui/avatar.html src=person.photo %} + {% include ui/avatar.html src=person.photo %} {{ person.full_name }} {{ person.department }} {{ forloop.index | random_number: 30, 90 }}% @@ -21,7 +21,7 @@
- {% include_cached ui/icon.html icon="more-horizontal" %} + {% include ui/icon.html icon="more-horizontal" %} {% endfor %} diff --git a/pages/_includes/cards/development-activity.html b/pages/_includes/cards/development-activity.html index 63bf4f739..c07357d5b 100644 --- a/pages/_includes/cards/development-activity.html +++ b/pages/_includes/cards/development-activity.html @@ -13,7 +13,7 @@ - {% include_cached ui/avatar.html person-id=10 %} + {% include ui/avatar.html person-id=10 %} {{ site.data.people[10].full_name }} Initial commit @@ -21,7 +21,7 @@ - {% include_cached ui/avatar.html person-id=17 %} + {% include ui/avatar.html person-id=17 %} {{ site.data.people[17].full_name }} Main structure @@ -29,7 +29,7 @@ - {% include_cached ui/avatar.html person-id=16 %} + {% include ui/avatar.html person-id=16 %} {{ site.data.people[16].full_name }} Left sidebar adjustments @@ -37,7 +37,7 @@ - {% include_cached ui/avatar.html person-id=12 %} + {% include ui/avatar.html person-id=12 %} {{ site.data.people[12].full_name }} Topbar dropdown style @@ -45,7 +45,7 @@ - {% include_cached ui/avatar.html person-id=19 %} + {% include ui/avatar.html person-id=19 %} {{ site.data.people[19].full_name }} Fixes #625 diff --git a/pages/_includes/cards/feed-card.html b/pages/_includes/cards/feed-card.html index 870815414..bed264501 100644 --- a/pages/_includes/cards/feed-card.html +++ b/pages/_includes/cards/feed-card.html @@ -3,7 +3,7 @@
- {% include_cached ui/avatar.html person=person size="md" %} + {% include ui/avatar.html person=person size="md" %}
{{ person.full_name }} @@ -176,13 +176,13 @@
- {% include_cached ui/icon.html icon="thumbs-up" %} 321 Likes + {% include ui/icon.html icon="thumbs-up" %} 321 Likes - {% include_cached ui/icon.html icon="message-square" %} 56 Comments + {% include ui/icon.html icon="message-square" %} 56 Comments - {% include_cached ui/icon.html icon="share-2" %} + {% include ui/icon.html icon="share-2" %} Share
@@ -192,10 +192,10 @@
- {% include_cached ui/icon.html icon="image" %} - {% include_cached ui/icon.html icon="video" %} - {% include_cached ui/icon.html icon="map-pin" %} - {% include_cached ui/icon.html icon="paperclip" %} + {% include ui/icon.html icon="image" %} + {% include ui/icon.html icon="video" %} + {% include ui/icon.html icon="map-pin" %} + {% include ui/icon.html icon="paperclip" %}
diff --git a/pages/_includes/cards/gallery.html b/pages/_includes/cards/gallery.html index eedb43141..7c398b2c4 100644 --- a/pages/_includes/cards/gallery.html +++ b/pages/_includes/cards/gallery.html @@ -2,18 +2,18 @@
- {% include_cached ui/avatar.html person=include.person class="mr-3 rounded" %} + {% include ui/avatar.html person=include.person class="mr-3 rounded" %}
{{ include.person.full_name }}
{{ forloop.index | random_date_ago: 10 | timeago }}
- {% include_cached ui/icon.html icon="eye" %} + {% include ui/icon.html icon="eye" %} {{ forloop.index | random_number: 300, 600 }} - {% include_cached ui/icon.html icon="heart" %} + {% include ui/icon.html icon="heart" %} {{ forloop.index | random_number: 20, 100 }}
diff --git a/pages/_includes/cards/icons.html b/pages/_includes/cards/icons.html index f67342d87..587f3fd46 100644 --- a/pages/_includes/cards/icons.html +++ b/pages/_includes/cards/icons.html @@ -5,7 +5,7 @@
    {% for icon in site.data.icons[include.group] %}
  • - {% include_cached ui/icon.html icon=icon class="icon-md" %} + {% include ui/icon.html icon=icon class="icon-md" %}
    • {% endfor %} {% for icon in (0..20) %} diff --git a/pages/_includes/cards/invoices.html b/pages/_includes/cards/invoices.html index 00f4a613b..beaa8bbd5 100644 --- a/pages/_includes/cards/invoices.html +++ b/pages/_includes/cards/invoices.html @@ -1,84 +1,82 @@
    -
    -

    Invoices

    -
    -
    - -
    - Show -
    - -
    - entries -
    - -
    - Serach: -
    - -
    -
    - -
    -
    - - - - - - - - - - - - - - - - - - {% for invoice in site.data.invoices limit: 8 %} - - - - - - - - - - - - - - {% endfor %} - -
    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" %}
    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" %} -
    -
    -
    -
    -

    Showing 1 to 8 of 16 entries

    -
    -
    - Previous12Next -
    -
    -
    +
    +

    Invoices

    +
    +
    + +
    +
    + Show +
    + +
    + entries +
    + +
    + Search: +
    + +
    +
    +
    + +
    +
    + + + + + + + + + + + + + + + + + + {% for invoice in site.data.invoices limit: 8 %} + + + + + + + + + + + + + + {% endfor %} + +
    No. {% include ui/icon.html icon="chevron-up" class="icon-sm text-dark icon-thick" %}Invoice Subject {% include ui/icon.html icon="code" class="icon-sm" %}Client {% include ui/icon.html icon="code" class="icon-sm" %}VAT No. {% include ui/icon.html icon="code" class="icon-sm" %}Created {% include ui/icon.html icon="code" class="icon-sm" %}Status {% include ui/icon.html icon="code" class="icon-sm" %}Price {% include ui/icon.html icon="code" class="icon-sm" %}
    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 ui/icon.html icon="edit" class="icon-sm float-right" %} +
    +
    +
    +

    Showing 1 to 8 of 16 entries

    + {% include ui/pagination.html class="m-0 ml-auto" %} +
    +
diff --git a/pages/_includes/cards/most-visited-pages.html b/pages/_includes/cards/most-visited-pages.html index 89e75c8c2..691f35b99 100644 --- a/pages/_includes/cards/most-visited-pages.html +++ b/pages/_includes/cards/most-visited-pages.html @@ -14,7 +14,7 @@ {% for page in site.data.pages %} {{ page.uri }} - {% include_cached ui/icon.html icon="link" %} + {% include ui/icon.html icon="link" %} {{ page.visitors | format_number }} {{ page.unique | format_number }} {{ page.bounce-rate }} diff --git a/pages/_includes/cards/music/tracks-list.html b/pages/_includes/cards/music/tracks-list.html index 8edb59dfa..560415fe0 100644 --- a/pages/_includes/cards/music/tracks-list.html +++ b/pages/_includes/cards/music/tracks-list.html @@ -21,10 +21,10 @@ {{ track.duration_ms | miliseconds_to_minutes }}
- {% include_cached ui/icon.html icon="heart" %} + {% include ui/icon.html icon="heart" %}
- {% include_cached ui/icon.html icon="more-horizontal" %} + {% include ui/icon.html icon="more-horizontal" %}
diff --git a/pages/_includes/cards/pricing-card.html b/pages/_includes/cards/pricing-card.html index 959b5ea61..cdd2e6eef 100644 --- a/pages/_includes/cards/pricing-card.html +++ b/pages/_includes/cards/pricing-card.html @@ -14,9 +14,9 @@ {% for feature in features %}
  • {% if available-features[forloop.index0] == '1' %} - {% include_cached ui/icon.html icon="check" class="mr-1 text-success" %} + {% include ui/icon.html icon="check" class="mr-1 text-success" %} {% else %} - {% include_cached ui/icon.html icon="x" class="mr-1 text-danger" %} + {% include ui/icon.html icon="x" class="mr-1 text-danger" %} {% endif %} {{ feature }}
    • diff --git a/pages/_includes/cards/profile-2.html b/pages/_includes/cards/profile-2.html index 5360012b7..2093793a4 100644 --- a/pages/_includes/cards/profile-2.html +++ b/pages/_includes/cards/profile-2.html @@ -1,7 +1,7 @@
    - {% include_cached ui/avatar.html person-id=8 size="xl" %} + {% include ui/avatar.html person-id=8 size="xl" %}

    {{ site.data.people[20].first_name }} {{ site.data.people[20].last_name }}

    {{ site.data.people[20].job_title }}

    @@ -9,17 +9,17 @@ diff --git a/pages/_includes/cards/profile-timeline.html b/pages/_includes/cards/profile-timeline.html index efd59766d..8d1dd116f 100644 --- a/pages/_includes/cards/profile-timeline.html +++ b/pages/_includes/cards/profile-timeline.html @@ -3,7 +3,7 @@
    - {% include_cached ui/button.html icon="camera" icon-only=true color="secondary" %} + {% include ui/button.html icon="camera" icon-only=true color="secondary" %}
    @@ -11,7 +11,7 @@
  • - {% include_cached ui/avatar.html person-id=5 class="mr-3" %} + {% include ui/avatar.html person-id=5 class="mr-3" %}
    @@ -28,7 +28,7 @@
    • - {% include_cached ui/avatar.html person-id=8 class="mr-3" %} + {% include ui/avatar.html person-id=8 class="mr-3" %}
      {{ site.data.people[7].first_name }} {{ site.data.people[7].last_name }}: @@ -38,7 +38,7 @@
    • - {% include_cached ui/avatar.html person-id=10 class="mr-3" %} + {% include ui/avatar.html person-id=10 class="mr-3" %}
      {{ site.data.people[9].first_name }} {{ site.data.people[9].last_name }}: @@ -53,7 +53,7 @@
    • - {% include_cached ui/avatar.html person-id=11 class="mr-3" %} + {% include ui/avatar.html person-id=11 class="mr-3" %}
      @@ -70,7 +70,7 @@
    • - {% include_cached ui/avatar.html person-id=15 class="mr-3" %} + {% include ui/avatar.html person-id=15 class="mr-3" %}
      @@ -86,7 +86,7 @@ diff --git a/pages/_includes/parts/pagination.html b/pages/_includes/ui/pagination.html similarity index 75% rename from pages/_includes/parts/pagination.html rename to pages/_includes/ui/pagination.html index dc14bd0a2..9a54a9072 100644 --- a/pages/_includes/parts/pagination.html +++ b/pages/_includes/ui/pagination.html @@ -7,7 +7,7 @@
      Previous
      {{ include.prev-description }}
      {% else %} - {% if include.icons %}{% include_cached ui/icon.html icon="chevron-left" %}{% else %}{% include_cached ui/icon.html icon="chevron-left" %} Prev{% endif %} + {% if include.icons %}{% include ui/icon.html icon="chevron-left" %}{% else %}{% include ui/icon.html icon="chevron-left" %} Prev{% endif %} {% endif %}
      • @@ -23,7 +23,7 @@
      Next
      {{ include.next-description }}
      {% else %} - {% if include.icons %}{% include_cached ui/icon.html icon="chevron-right" %}{% else %}Next {% include_cached ui/icon.html icon="chevron-right" %}{% endif %} + {% if include.icons %}{% include ui/icon.html icon="chevron-right" %}{% else %}Next {% include ui/icon.html icon="chevron-right" %}{% endif %} {% endif %} diff --git a/pages/_includes/ui/stars.html b/pages/_includes/ui/stars.html index 6fdefa70f..63f95e7a4 100644 --- a/pages/_includes/ui/stars.html +++ b/pages/_includes/ui/stars.html @@ -8,9 +8,9 @@ {% for i in (1..5) %} {% if forloop.index <= rate and filled %} - {% include_cached ui/icon.html icon=icon class="icon-filled" %} + {% include ui/icon.html icon=icon class="icon-filled" %} {% else %} - {% include_cached ui/icon.html icon=icon %} + {% include ui/icon.html icon=icon %} {% endif %} {% endfor %} diff --git a/pages/_includes/ui/toast.html b/pages/_includes/ui/toast.html index 8c5a3ef18..fd0227a9c 100644 --- a/pages/_includes/ui/toast.html +++ b/pages/_includes/ui/toast.html @@ -2,7 +2,7 @@ {% assign person = site.data.people[person-id] %}