From 6f42a761c7faea76cc51d4866b41779813ba1f02 Mon Sep 17 00:00:00 2001 From: codecalm Date: Fri, 29 Nov 2019 16:57:13 +0100 Subject: [PATCH] ubpdate jekyll to v4.0, build time fixes --- Gemfile | 16 +- _config.yml | 10 +- pages/_data/menu.yml | 6 + pages/_data/people.json | 4 +- pages/_docs/buttons.md | 24 +-- pages/_docs/form-elements.md | 2 +- pages/_docs/spinners.md | 10 +- pages/_includes/cards/blog-single.html | 2 +- pages/_includes/cards/comments.html | 4 +- pages/_includes/cards/company-employees.html | 2 +- pages/_includes/cards/feed-card.html | 14 +- pages/_includes/cards/most-visited-pages.html | 2 +- pages/_includes/cards/pricing-card.html | 4 +- pages/_includes/cards/profile-2.html | 6 +- pages/_includes/cards/profile.html | 2 +- pages/_includes/cards/project-kanban.html | 4 +- pages/_includes/cards/ribbon.html | 2 +- pages/_includes/cards/small-stats-2.html | 2 +- pages/_includes/cards/small-stats.html | 6 +- pages/_includes/cards/store-product.html | 2 +- pages/_includes/cards/subscribe.html | 2 +- pages/_includes/cards/tabs.html | 13 +- pages/_includes/cards/tasks.html | 6 +- pages/_includes/cards/timeline.html | 14 +- pages/_includes/cards/user-info.html | 29 ++- pages/_includes/cards/users-list.html | 2 +- pages/_includes/forms/form-elements-1.html | 2 +- pages/_includes/layout/banner.html | 8 + pages/_includes/layout/menu.html | 2 +- pages/_includes/layout/page-title.html | 8 +- pages/_includes/layout/topnav.html | 2 +- pages/_includes/parts/calendar.html | 4 +- pages/_includes/parts/input-color.html | 2 +- pages/_includes/parts/input-icon.html | 4 +- pages/_includes/parts/navbar.html | 203 +++++++++--------- pages/_includes/parts/pagination.html | 4 +- pages/_includes/ui/alert.html | 2 +- pages/_includes/ui/avatar.html | 25 +-- pages/_includes/ui/button.html | 4 +- pages/_includes/ui/dropdown-menu.html | 10 +- pages/_includes/ui/empty.html | 4 +- pages/_includes/ui/input-selectgroup.html | 2 +- pages/_includes/ui/nav.html | 4 +- pages/_includes/ui/sparkline.html | 2 +- pages/_includes/ui/stars.html | 4 +- pages/_includes/ui/trending.html | 2 +- pages/_layouts/base.html | 4 +- pages/_layouts/component.html | 4 +- pages/_layouts/docs.html | 6 +- pages/all.html | 2 +- pages/buttons.html | 10 +- pages/email.html | 14 +- pages/gallery.html | 4 +- pages/text.html | 14 +- pages/users.html | 8 +- 55 files changed, 290 insertions(+), 264 deletions(-) create mode 100644 pages/_includes/layout/banner.html diff --git a/Gemfile b/Gemfile index 4fa45c13..6d78e3d0 100644 --- a/Gemfile +++ b/Gemfile @@ -4,10 +4,14 @@ source "https://rubygems.org" git_source(:github) {|repo_name| "https://github.com/#{repo_name}" } -gem "jekyll", ">= 3.8.6" -gem "jekyll-random", "~> 0.0.3" -gem "jekyll-tidy" -gem "jekyll-timeago" -gem 'jekyll-redirect-from' -gem 'jekyll-include-cache' +gem "jekyll", "~> 4.0" + +group :jekyll_plugins do + gem "jekyll-random" + 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/_config.yml b/_config.yml index 529fdaf8..f0094ccb 100644 --- a/_config.yml +++ b/_config.yml @@ -1,11 +1,12 @@ source: pages destination: tmp -title: Tabler Admin Template +version: 1.0-alpha +title: Tabler description: Premium and Open Source dashboard template with responsive and high quality UI. github_url: https://github.com/tabler/tabler -debug: false +debug: true plugins: - jekyll-random @@ -14,6 +15,9 @@ plugins: - jekyll-redirect-from - jekyll-include-cache +exclude: +- .jekyll-cache + keep_files: - css/ui-kit.css - css/dark.css @@ -130,6 +134,8 @@ button_variants: title: Warning - name: danger title: Danger + - name: dark + title: Dark socials: - name: facebook diff --git a/pages/_data/menu.yml b/pages/_data/menu.yml index caf702b8..04b8ef70 100644 --- a/pages/_data/menu.yml +++ b/pages/_data/menu.yml @@ -13,6 +13,12 @@ cards: title: Cards icon: file +theme: + title: Theme + icon: edit-3 + pages: + + charts: url: charts.html title: Charts diff --git a/pages/_data/people.json b/pages/_data/people.json index 81bbd8a7..44129830 100644 --- a/pages/_data/people.json +++ b/pages/_data/people.json @@ -1,6 +1,6 @@ [ { - "id": 1, + "id": "1", "first_name": "Paweł", "last_name": "Kuna", "full_name": "Paweł Kuna", @@ -26,7 +26,7 @@ "photo": "img/avatars/000m.jpg" }, { - "id": 2, + "id": "2", "first_name": "Jeffie", "last_name": "Lewzey", "full_name": "Jeffie Lewzey", diff --git a/pages/_docs/buttons.md b/pages/_docs/buttons.md index 3021345d..5485e79c 100644 --- a/pages/_docs/buttons.md +++ b/pages/_docs/buttons.md @@ -33,7 +33,7 @@ Use any of the available button classes to quickly create a styled button . We p Make buttons look inactive by adding the disabled boolean attribute to any `.btn` element. ``s don’t support the disabled attribute, so you must add the `.disabled` class to make it visually appear disabled. {% example html wrapper=btn-list %} {% for button in site.button_variants %} -{% include ui/button.html color=button.name text=button.title disabled="true" %} +{% include_cached ui/button.html color=button.name text=button.title disabled="true" %} {% endfor %} {% endexample %} @@ -55,7 +55,7 @@ Add `.btn-square` to button to remove border-radius. {% example html wrapper=btn-list %} {% for button in site.button_variants %} -{% include ui/button.html text=button.title color=button.name square=true %} +{% include_cached ui/button.html text=button.title color=button.name square=true %} {% endfor %} {% endexample %} @@ -65,7 +65,7 @@ Add `.btn-pill` class to any button to make them more rounded. {% example html wrapper=btn-list %} {% for button in site.button_variants %} -{% include ui/button.html text=button.title color=button.name pill=true %} +{% include_cached ui/button.html text=button.title color=button.name pill=true %} {% endfor %} {% endexample %} @@ -75,7 +75,7 @@ In need of a button, but not the hefty background colors they bring? Replace the {% example html wrapper=btn-list %} {% for button in site.button_variants %} -{% include ui/button.html text=button.title color=button.name outline=true %} +{% include_cached ui/button.html text=button.title color=button.name outline=true %} {% endfor %} {% endexample %} @@ -83,7 +83,7 @@ In need of a button, but not the hefty background colors they bring? Replace the {% example html %} {% for button in site.button_variants %} - {% include ui/button.html text="Button" label="star" color=button.name class="mr-2" %} + {% include_cached ui/button.html text="Button" label="star" color=button.name class="mr-2" %} {% endfor %} {% endexample %} @@ -127,7 +127,7 @@ A button can be formatted to link to a social website {% example html wrapper=btn-list %} {% for button in site.socials %} -{% include ui/button.html color=button.name icon=button.icon text=button.title %} +{% include_cached ui/button.html color=button.name icon=button.icon text=button.title %} {% endfor %} {% endexample %} @@ -135,7 +135,7 @@ You can use only icons. {% example html wrapper=btn-list %} {% for button in site.socials %} -{% include ui/button.html color=button.name icon=button.icon %} +{% include_cached ui/button.html color=button.name icon=button.icon %} {% endfor %} {% endexample %} @@ -196,11 +196,11 @@ 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 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" %} +{% 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" %} {% endexample %} ### List of buttons diff --git a/pages/_docs/form-elements.md b/pages/_docs/form-elements.md index 8895561a..a9711534 100644 --- a/pages/_docs/form-elements.md +++ b/pages/_docs/form-elements.md @@ -197,7 +197,7 @@ title: Form Elements - + {% endexample %} diff --git a/pages/_docs/spinners.md b/pages/_docs/spinners.md index a68644bc..31b1a823 100644 --- a/pages/_docs/spinners.md +++ b/pages/_docs/spinners.md @@ -43,9 +43,9 @@ done: true ### Buttons {% example html wrapper=btn-list %} -{% 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" %} +{% 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" %} {% endexample %} diff --git a/pages/_includes/cards/blog-single.html b/pages/_includes/cards/blog-single.html index 77e3d37c..a30074a8 100644 --- a/pages/_includes/cards/blog-single.html +++ b/pages/_includes/cards/blog-single.html @@ -18,7 +18,7 @@
- {% include ui/icon.html icon="heart" use-svg=true %} + {% include_cached ui/icon.html icon="heart" use-svg=true %}
diff --git a/pages/_includes/cards/comments.html b/pages/_includes/cards/comments.html index 9cc58e79..5b030487 100644 --- a/pages/_includes/cards/comments.html +++ b/pages/_includes/cards/comments.html @@ -21,9 +21,9 @@

+{{ forloop.index | random_number: 20, 50 }} - {% include ui/icon.html icon="chevron-up" %} + {% include_cached ui/icon.html icon="chevron-up" %} - {% include ui/icon.html icon="chevron-down" %} + {% include_cached ui/icon.html icon="chevron-down" %} · Reply diff --git a/pages/_includes/cards/company-employees.html b/pages/_includes/cards/company-employees.html index 18c2aba8..9afb9b02 100644 --- a/pages/_includes/cards/company-employees.html +++ b/pages/_includes/cards/company-employees.html @@ -21,7 +21,7 @@
- {% include ui/icon.html icon="more-horizontal" %} + {% include_cached ui/icon.html icon="more-horizontal" %} {% endfor %} diff --git a/pages/_includes/cards/feed-card.html b/pages/_includes/cards/feed-card.html index bed26450..1092323c 100644 --- a/pages/_includes/cards/feed-card.html +++ b/pages/_includes/cards/feed-card.html @@ -176,13 +176,13 @@
- {% include ui/icon.html icon="thumbs-up" %} 321 Likes + {% include_cached ui/icon.html icon="thumbs-up" %} 321 Likes - {% include ui/icon.html icon="message-square" %} 56 Comments + {% include_cached ui/icon.html icon="message-square" %} 56 Comments - {% include ui/icon.html icon="share-2" %} + {% include_cached ui/icon.html icon="share-2" %} Share
@@ -192,10 +192,10 @@
- {% 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" %} + {% 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" %}
diff --git a/pages/_includes/cards/most-visited-pages.html b/pages/_includes/cards/most-visited-pages.html index 691f35b9..89e75c8c 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 ui/icon.html icon="link" %} + {% include_cached ui/icon.html icon="link" %} {{ page.visitors | format_number }} {{ page.unique | format_number }} {{ page.bounce-rate }} diff --git a/pages/_includes/cards/pricing-card.html b/pages/_includes/cards/pricing-card.html index c973d3ef..06812f04 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 ui/icon.html icon="check" class="mr-1 text-success" %} + {% include_cached ui/icon.html icon="check" class="mr-1 text-success" %} {% else %} - {% include ui/icon.html icon="x" class="mr-1 text-danger" %} + {% include_cached 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 2093793a..d83403fc 100644 --- a/pages/_includes/cards/profile-2.html +++ b/pages/_includes/cards/profile-2.html @@ -9,17 +9,17 @@ diff --git a/pages/_includes/cards/profile.html b/pages/_includes/cards/profile.html index 35dff432..34f654a9 100644 --- a/pages/_includes/cards/profile.html +++ b/pages/_includes/cards/profile.html @@ -10,7 +10,7 @@

    diff --git a/pages/_includes/cards/project-kanban.html b/pages/_includes/cards/project-kanban.html index d7e92e0f..fd295fd6 100644 --- a/pages/_includes/cards/project-kanban.html +++ b/pages/_includes/cards/project-kanban.html @@ -8,7 +8,7 @@
    {% include ui/dropdown-menu.html right=true %}
    @@ -20,7 +20,7 @@
    - {% include ui/icon.html icon="check-square" class="mr-2" %} + {% include_cached ui/icon.html icon="check-square" class="mr-2" %} 5/10
    Due {{ due }} diff --git a/pages/_includes/cards/ribbon.html b/pages/_includes/cards/ribbon.html index cdac5b1d..d4adafd8 100644 --- a/pages/_includes/cards/ribbon.html +++ b/pages/_includes/cards/ribbon.html @@ -9,5 +9,5 @@ {% endif %}
    -
    {% if include.text %}{{ include.text }}{% else %}{% include ui/icon.html icon="star" class="icon-filled" use-svg=true %}{% endif %}
    +
    {% if include.text %}{{ include.text }}{% else %}{% include_cached ui/icon.html icon="star" class="icon-filled" use-svg=true %}{% endif %}
    diff --git a/pages/_includes/cards/small-stats-2.html b/pages/_includes/cards/small-stats-2.html index 26bd605c..b9e67422 100644 --- a/pages/_includes/cards/small-stats-2.html +++ b/pages/_includes/cards/small-stats-2.html @@ -14,7 +14,7 @@
    - {% include ui/icon.html icon=icon %} + {% include_cached ui/icon.html icon=icon %}
    {{ include.title | default: 'Customers' }}

    {{ include.count | default: "1,850" }}

    diff --git a/pages/_includes/cards/small-stats.html b/pages/_includes/cards/small-stats.html index 44bb69d0..34987af2 100644 --- a/pages/_includes/cards/small-stats.html +++ b/pages/_includes/cards/small-stats.html @@ -3,7 +3,7 @@
    {% if include.icon %} - {% include ui/icon.html icon=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" %} {% endif %} @@ -18,7 +18,7 @@
    {{ include.count | default: 1700 | format_number }} {{ include.subtitle }} {% if include.small-icon %} - {% include ui/icon.html icon=include.small-icon color=include.color class="icon-sm ml-1" %} + {% include_cached ui/icon.html icon=include.small-icon color=include.color class="icon-sm ml-1" %} {% endif %}
    {{ include.description | default: "Users" }}
    @@ -26,7 +26,7 @@ {% if include.second-icon %}
    - {% include ui/icon.html icon=include.second-icon color=include.color class="icon-lg icon-thin" %} + {% include_cached ui/icon.html icon=include.second-icon color=include.color class="icon-lg icon-thin" %}
    {% endif %} diff --git a/pages/_includes/cards/store-product.html b/pages/_includes/cards/store-product.html index b2f9f508..24ae1c47 100644 --- a/pages/_includes/cards/store-product.html +++ b/pages/_includes/cards/store-product.html @@ -13,7 +13,7 @@ {{ product.price }}
    - {% include ui/icon.html icon='plus' %} Add to cart + {% include_cached ui/icon.html icon='plus' %} Add to cart
    diff --git a/pages/_includes/cards/subscribe.html b/pages/_includes/cards/subscribe.html index ecac2495..3f5cc5aa 100644 --- a/pages/_includes/cards/subscribe.html +++ b/pages/_includes/cards/subscribe.html @@ -25,7 +25,7 @@
    {% include ui/dropdown-menu.html right=true %}
    diff --git a/pages/_includes/cards/tabs.html b/pages/_includes/cards/tabs.html index b128983f..9166c4b4 100644 --- a/pages/_includes/cards/tabs.html +++ b/pages/_includes/cards/tabs.html @@ -11,21 +11,24 @@
    diff --git a/pages/_includes/cards/tasks.html b/pages/_includes/cards/tasks.html index 9e8a1c97..b6c96e28 100644 --- a/pages/_includes/cards/tasks.html +++ b/pages/_includes/cards/tasks.html @@ -16,14 +16,14 @@ {{ task.name }} - {% include ui/icon.html icon="calendar" %} + {% include_cached ui/icon.html icon="calendar" %} {{ forloop.index | random_date: "2019-01-01", "2018-01-01" | date: '%B %d, %Y' }} - {% include ui/icon.html icon="check" %} {{ forloop.index | random_number: 0, 6 }}/{{ forloop.index | random_number: 5, 10 }} + {% include_cached ui/icon.html icon="check" %} {{ forloop.index | random_number: 0, 6 }}/{{ forloop.index | random_number: 5, 10 }} - {% include ui/icon.html icon="message-square" %} {{ forloop.index | random_number: 0, 12 }} + {% include_cached ui/icon.html icon="message-square" %} {{ forloop.index | random_number: 0, 12 }} {% include ui/avatar.html person-id=forloop.index size="sm" %} diff --git a/pages/_includes/cards/timeline.html b/pages/_includes/cards/timeline.html index 0b7dbc82..29c3c7f8 100644 --- a/pages/_includes/cards/timeline.html +++ b/pages/_includes/cards/timeline.html @@ -5,7 +5,7 @@
    • -
      {% include ui/icon.html icon="twitter" %}
      +
      {% include_cached ui/icon.html icon="twitter" %}
      10 hrs ago

      +1150 Followers

      @@ -13,7 +13,7 @@
    • -
      {% include ui/icon.html icon="briefcase" %}
      +
      {% include_cached ui/icon.html icon="briefcase" %}
      2 hrs ago

      +3 New Products were added!

      @@ -21,7 +21,7 @@
    • -
      {% include ui/icon.html icon="check" %}
      +
      {% include_cached ui/icon.html icon="check" %}
      1 day ago

      Database backup completed!

      @@ -29,7 +29,7 @@
    • -
      {% include ui/icon.html icon="facebook" %}
      +
      {% include_cached ui/icon.html icon="facebook" %}
      1 day ago

      +290 Page Likes

      @@ -37,7 +37,7 @@
    • -
      {% include ui/icon.html icon="user-plus" %}
      +
      {% include_cached ui/icon.html icon="user-plus" %}
      2 days ago

      +3 Friend Requests

      @@ -49,7 +49,7 @@
    • -
      {% include ui/icon.html icon="image" %}
      +
      {% include_cached ui/icon.html icon="image" %}
      3 days ago

      +2 New photos

      @@ -70,7 +70,7 @@
    • -
      {% include ui/icon.html icon="settings" %}
      +
      {% include_cached ui/icon.html icon="settings" %}
      2 weeks ago

      System updated to v2.02

      diff --git a/pages/_includes/cards/user-info.html b/pages/_includes/cards/user-info.html index 7f5f1c2e..15ad3908 100644 --- a/pages/_includes/cards/user-info.html +++ b/pages/_includes/cards/user-info.html @@ -1,33 +1,32 @@ -{% assign person-id = include.person-id | default: 25 %} -{% assign person = site.data.people | where: "id", person-id %} -{% assign p = person[0] %} +{% assign person-id = include.person-id | default: 25 | minus: 1 %} +{% assign person = site.data.people[person-id] %}
      {{ include.title | default: 'Basic info' }}
      - {% include ui/icon.html icon="book" class="mr-2 text-muted" %} - Went to: {{ p.university }} + {% include_cached ui/icon.html icon="book" class="mr-2 text-muted" %} + Went to: {{ person.university }}
      - {% include ui/icon.html icon="briefcase" class="mr-2 text-muted" %} - Worked at: {{ p.company }} + {% include_cached ui/icon.html icon="briefcase" class="mr-2 text-muted" %} + Worked at: {{ person.company }}
      - {% include ui/icon.html icon="home" class="mr-2 text-muted" %} - Lives in: {{ p.city }}, {{ p.country }} + {% include_cached ui/icon.html icon="home" class="mr-2 text-muted" %} + Lives in: {{ person.city }}, {{ person.country }}
      - {% include ui/icon.html icon="map-pin" class="mr-2 text-muted" %} - From: {% include ui/flag.html flag=p.country_code %} {{ p.country }} + {% include_cached ui/icon.html icon="map-pin" class="mr-2 text-muted" %} + From: {% include ui/flag.html flag=person.country_code %} {{ person.country }}
      - {% include ui/icon.html icon="calendar" class="mr-2 text-muted" %} - Birth date: {{ p.birth_date }} + {% include_cached ui/icon.html icon="calendar" class="mr-2 text-muted" %} + Birth date: {{ person.birth_date }}
      - {% include ui/icon.html icon="clock" class="mr-2 text-muted" %} - Time zone: {{ p.time_zone }} + {% include_cached ui/icon.html icon="clock" class="mr-2 text-muted" %} + Time zone: {{ person.time_zone }}
      diff --git a/pages/_includes/cards/users-list.html b/pages/_includes/cards/users-list.html index 9e98ee91..8cc0fa5d 100644 --- a/pages/_includes/cards/users-list.html +++ b/pages/_includes/cards/users-list.html @@ -30,7 +30,7 @@ {% else %} {% assign star-color = 'text-muted' %} {% endif %} - {% include ui/icon.html icon="star" class=star-color %} + {% include_cached ui/icon.html icon="star" class=star-color %} {% endif %}
      {% endfor %} diff --git a/pages/_includes/forms/form-elements-1.html b/pages/_includes/forms/form-elements-1.html index 428f1144..bf32f824 100644 --- a/pages/_includes/forms/form-elements-1.html +++ b/pages/_includes/forms/form-elements-1.html @@ -69,7 +69,7 @@
    - +
    diff --git a/pages/_includes/layout/banner.html b/pages/_includes/layout/banner.html new file mode 100644 index 00000000..6e1bc6b9 --- /dev/null +++ b/pages/_includes/layout/banner.html @@ -0,0 +1,8 @@ + diff --git a/pages/_includes/layout/menu.html b/pages/_includes/layout/menu.html index aecdba54..0db32531 100644 --- a/pages/_includes/layout/menu.html +++ b/pages/_includes/layout/menu.html @@ -13,7 +13,7 @@ %}href="{{ level-1[1].url }}" data-toggle="{{ level-1[1].toggle }}" {% else %}href="{{ site.base }}/{{ level-1[1].url }}" {% endif %}> - {% include ui/icon.html icon=icon %} + {% include_cached ui/icon.html icon=icon %} {{ level-1[1].title }} diff --git a/pages/_includes/layout/page-title.html b/pages/_includes/layout/page-title.html index d94d5624..d9556fad 100644 --- a/pages/_includes/layout/page-title.html +++ b/pages/_includes/layout/page-title.html @@ -27,17 +27,17 @@ {% if page.page-title-actions == 'users' %}
    - {% include ui/button.html text="New user" color="primary" icon="plus" %} + {% include_cached ui/button.html text="New user" color="primary" icon="plus" %}
    {% elsif page.page-title-actions == 'calendar' %}
    - {% include ui/button.html text="Add event" color="primary" icon="plus" %} + {% include_cached ui/button.html text="Add event" color="primary" icon="plus" %}
    {% else %} - {% include ui/button.html text="New view" color="secondary" icon="plus" %} + {% include_cached ui/button.html text="New view" color="secondary" icon="plus" %} - {% include ui/button.html text="Create new report" color="primary" class="ml-3" %} + {% include_cached ui/button.html text="Create new report" color="primary" class="ml-3" %} {% endif %}
    {% endif %} diff --git a/pages/_includes/layout/topnav.html b/pages/_includes/layout/topnav.html index 20db118c..76618c87 100644 --- a/pages/_includes/layout/topnav.html +++ b/pages/_includes/layout/topnav.html @@ -1,6 +1,6 @@
    - {% include parts/navbar.html logo=true search=true user-menu=1 person=1 dark=include.dark notifications=true %} + {% include parts/navbar.html logo=true search=true user-menu=1 person-id=1 dark=include.dark notifications=true %}
    diff --git a/pages/_includes/parts/calendar.html b/pages/_includes/parts/calendar.html index aa6a81ad..311ee972 100644 --- a/pages/_includes/parts/calendar.html +++ b/pages/_includes/parts/calendar.html @@ -10,11 +10,11 @@
    {{ include.title | default: 'March 2017' }}
    diff --git a/pages/_includes/parts/input-color.html b/pages/_includes/parts/input-color.html index d6e5940c..e1fe4c6a 100644 --- a/pages/_includes/parts/input-color.html +++ b/pages/_includes/parts/input-color.html @@ -1,7 +1,7 @@
    - {% for color in site.colors limit: 9 offset: 1 %} + {% for color in site.colors limit: 10 %}
    + + {% endif %} -
  • - Source code -
    • +
  • + Source code +
    • - {% if include.user-menu %} -
  • - - {% include ui/avatar.html src=person.photo %} - - {{ person.full_name }} - Administrator - + {% if include.user-menu %} +
  • + + {% include ui/avatar.html src=person.photo %} + + {{ person.full_name }} + Administrator + + +
    + + {% include_cached ui/icon.html icon="user" class="dropdown-icon" %} Profile -
    - - {% include ui/icon.html icon="user" class="dropdown-icon" %} Profile - - - {% include ui/icon.html icon="settings" class="dropdown-icon" %} Settings - - - {% include ui/icon.html icon="mail" class="dropdown-icon" %} Inbox - 6 - - - {% include ui/icon.html icon="send" class="dropdown-icon" %} Message - -
    - - {% include ui/icon.html icon="help-circle" class="dropdown-icon" %} Need help? - - - {% include ui/icon.html icon="log-out" class="dropdown-icon" %} Sign out - -
    -
    • - {% endif %} - - {% if include.manage %} -
  • - Manage Widgets -
    • - {% endif %} - - {% if include.register %} -
  • - - Sign in + + {% include_cached ui/icon.html icon="settings" class="dropdown-icon" %} Settings -
    • -
  • - - Register + + {% include_cached ui/icon.html icon="mail" class="dropdown-icon" %} Inbox + 6 -
    • - {% endif %} + + {% include_cached ui/icon.html icon="send" class="dropdown-icon" %} Message + +
    + + {% include_cached ui/icon.html icon="help-circle" class="dropdown-icon" %} Need help? + + + {% include_cached ui/icon.html icon="log-out" class="dropdown-icon" %} Sign out + +
    + + {% endif %} + + {% if include.manage %} +
  • + Manage Widgets +
    • + {% endif %} + + {% if include.register %} +
  • + + Sign in + +
    • +
  • + + Register + +
    • + {% endif %} - {% if include.plus %} -
  • - {% include ui/icon.html icon="plus" %} -
    • - {% endif %} + {% if include.plus %} +
  • + {% include_cached ui/icon.html icon="plus" %} +
    • + {% endif %} - {% if include.premium %} -
  • - Go Premium -
    • - {% endif %} + {% if include.premium %} +
  • + Go Premium +
    • + {% endif %} - {% if include.sync %} -
  • - {% include ui/icon.html icon="rotate-cw" class="mr-2" %}Sync -
    • - {% endif %} - + {% if include.sync %} +
  • + {% include_cached ui/icon.html icon="rotate-cw" class="mr-2" %}Sync +
    • + {% endif %} + diff --git a/pages/_includes/parts/pagination.html b/pages/_includes/parts/pagination.html index 9a54a907..dc14bd0a 100644 --- a/pages/_includes/parts/pagination.html +++ b/pages/_includes/parts/pagination.html @@ -7,7 +7,7 @@
    Previous
    {{ include.prev-description }}
    {% else %} - {% if include.icons %}{% include ui/icon.html icon="chevron-left" %}{% else %}{% include ui/icon.html icon="chevron-left" %} Prev{% endif %} + {% if include.icons %}{% include_cached ui/icon.html icon="chevron-left" %}{% else %}{% include_cached ui/icon.html icon="chevron-left" %} Prev{% endif %} {% endif %} @@ -23,7 +23,7 @@
    Next
    {{ include.next-description }}
    {% else %} - {% if include.icons %}{% include ui/icon.html icon="chevron-right" %}{% else %}Next {% include ui/icon.html icon="chevron-right" %}{% endif %} + {% if include.icons %}{% include_cached ui/icon.html icon="chevron-right" %}{% else %}Next {% include_cached ui/icon.html icon="chevron-right" %}{% endif %} {% endif %} diff --git a/pages/_includes/ui/alert.html b/pages/_includes/ui/alert.html index 4dd1c28a..f470b051 100644 --- a/pages/_includes/ui/alert.html +++ b/pages/_includes/ui/alert.html @@ -1,7 +1,7 @@ {% assign person = include.person %} @@ -17,6 +17,6 @@

    {% assign button-text = include.button-text | default: "Search again" %} - {% include ui/button.html text=button-text color="primary" icon=include.button-icon %} + {% include_cached ui/button.html text=button-text color="primary" icon=include.button-icon %}
    diff --git a/pages/_includes/ui/input-selectgroup.html b/pages/_includes/ui/input-selectgroup.html index 9c07c902..575045c3 100644 --- a/pages/_includes/ui/input-selectgroup.html +++ b/pages/_includes/ui/input-selectgroup.html @@ -7,7 +7,7 @@ {% endfor %}
    diff --git a/pages/_includes/ui/nav.html b/pages/_includes/ui/nav.html index aecafb50..d13ac80f 100644 --- a/pages/_includes/ui/nav.html +++ b/pages/_includes/ui/nav.html @@ -6,7 +6,7 @@
  • - {% include ui/icon.html icon="star" class="mr-1" %} + {% include_cached ui/icon.html icon="star" class="mr-1" %} Link
    • @@ -17,7 +17,7 @@
  • - {% include ui/icon.html icon="settings" %} + {% include_cached ui/icon.html icon="settings" %}
    • diff --git a/pages/_includes/ui/sparkline.html b/pages/_includes/ui/sparkline.html index 03df42e2..a233e70f 100644 --- a/pages/_includes/ui/sparkline.html +++ b/pages/_includes/ui/sparkline.html @@ -12,7 +12,7 @@ {% endif %} {% if include.label-icon %}
    - {% include ui/icon.html icon=include.label-icon color=include.color %} + {% include_cached ui/icon.html icon=include.label-icon color=include.color %}
    {% endif %}
    diff --git a/pages/_includes/ui/stars.html b/pages/_includes/ui/stars.html index 63f95e7a..6fdefa70 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 ui/icon.html icon=icon class="icon-filled" %} + {% include_cached ui/icon.html icon=icon class="icon-filled" %} {% else %} - {% include ui/icon.html icon=icon %} + {% include_cached ui/icon.html icon=icon %} {% endif %} {% endfor %} diff --git a/pages/_includes/ui/trending.html b/pages/_includes/ui/trending.html index b85ddc05..4dde9248 100644 --- a/pages/_includes/ui/trending.html +++ b/pages/_includes/ui/trending.html @@ -11,5 +11,5 @@ {% endif %} - {{ value }}% {% include ui/icon.html icon=icon class="icon-thin" %} + {{ value }}% {% include_cached ui/icon.html icon=icon class="icon-thin" %} diff --git a/pages/_layouts/base.html b/pages/_layouts/base.html index 7e4ae75e..2897358d 100644 --- a/pages/_layouts/base.html +++ b/pages/_layouts/base.html @@ -1,4 +1,5 @@ +{% include_cached layout/banner.html %} @@ -19,8 +20,7 @@ - {% if page.title %}{{ page.title }} - {% endif %}{% if layout.title %}{{ layout.title }} - {% endif %}{% if - site.title %}{{ site.title }} - {% endif %}{{ site.description }} + {% if page.title %}{{ page.title }} - {% endif %}{% if layout.title %}{{ layout.title }} - {% endif %}{% if site.title %}{{ site.title }} - {% endif %}{{ site.description }} {% if page.description %} diff --git a/pages/_layouts/component.html b/pages/_layouts/component.html index b920c854..ba738778 100644 --- a/pages/_layouts/component.html +++ b/pages/_layouts/component.html @@ -55,11 +55,11 @@ og-component: true
    -
    {% include ui/button.html icon="clipboard" text="Copy code" color="secondary" block=true class="mt-4" %}
    +
    {% include_cached ui/button.html icon="clipboard" text="Copy code" color="secondary" block=true class="mt-4" %}
    - {% include ui/button.html icon="codesandbox" text="Edit in CodePen" color="primary" block=true class="mt-4" element="button" type="submit" %} + {% include_cached ui/button.html icon="codesandbox" text="Edit in CodePen" color="primary" block=true class="mt-4" element="button" type="submit" %}
    diff --git a/pages/_layouts/docs.html b/pages/_layouts/docs.html index f55e7f9d..333520a6 100644 --- a/pages/_layouts/docs.html +++ b/pages/_layouts/docs.html @@ -9,14 +9,14 @@ page-title: Documentation
    - {% include ui/icon.html icon="github" class="mr-2" %}Browse source code + {% include_cached ui/icon.html icon="github" class="mr-2" %}Browse source code
    {% for p in site.data.docs %} {% assign doc = site.docs | where: "slug", p.page | first %} - {{ doc.title }}{% if doc.done %} {% include ui/icon.html icon="check" color="green" %}{% endif %} + {{ doc.title }}{% if doc.done %} {% include_cached ui/icon.html icon="check" color="green" %}{% endif %} {% endfor %}
    @@ -26,7 +26,7 @@ page-title: Documentation
    -

    {{ page.title }}{% if page.done %} {% include ui/icon.html icon="check" color="green" %}{% endif %}

    +

    {{ page.title }}{% if page.done %} {% include_cached ui/icon.html icon="check" color="green" %}{% endif %}

    {% if page.plugin %}
    This module is available in tabler-{{ page.plugin }} plugin.
    diff --git a/pages/all.html b/pages/all.html index 5814b7fb..7ebda07c 100644 --- a/pages/all.html +++ b/pages/all.html @@ -20,7 +20,7 @@ menu: index
  • {% if page.done %} - {% include ui/icon.html icon="check" color="success" %} + {% include_cached ui/icon.html icon="check" color="success" %} {% endif %} {{ page.title | default: page.name }} diff --git a/pages/buttons.html b/pages/buttons.html index 9bfd18a7..09ff1406 100644 --- a/pages/buttons.html +++ b/pages/buttons.html @@ -12,7 +12,7 @@ done: true
    {% for color in site.colors %} {% assign c = color[0] %} - {% include ui/button.html text="Button" color=c %} + {% include_cached ui/button.html text="Button" color=c %} {% endfor %}
    • @@ -27,7 +27,7 @@ done: true
    {% for color in site.colors %} {% assign c = color[0] %} - {% include ui/button.html text="Button" outline=true color=c %} + {% include_cached ui/button.html text="Button" outline=true color=c %} {% endfor %}
    @@ -42,7 +42,7 @@ done: true
    {% for color in site.colors %} {% assign c = color[0] %} - {% include ui/button.html text="Button" color=c icon="star" %} + {% include_cached ui/button.html text="Button" color=c icon="star" %} {% endfor %}
    @@ -57,7 +57,7 @@ done: true
    {% for color in site.colors %} {% assign c = color[0] %} - {% include ui/button.html text="Button" outline=true color=c icon-right="star" %} + {% include_cached ui/button.html text="Button" outline=true color=c icon-right="star" %} {% endfor %}
    @@ -71,7 +71,7 @@ done: true
    {% for social in site.socials %} - {% include ui/button.html text=social.title color=social.name icon=social.icon %} + {% include_cached ui/button.html text=social.title color=social.name icon=social.icon %} {% endfor %}
    diff --git a/pages/email.html b/pages/email.html index b3da9239..8c4aeaef 100644 --- a/pages/email.html +++ b/pages/email.html @@ -11,25 +11,25 @@ page-title: Crypto currencies
    - {% include ui/icon.html icon="inbox" %}Inbox 14 + {% include_cached ui/icon.html icon="inbox" %}Inbox 14 - {% include ui/icon.html icon="send" %}Sent Mail + {% include_cached ui/icon.html icon="send" %}Sent Mail - {% include ui/icon.html icon="alert-circle" %}Important 3 + {% include_cached ui/icon.html icon="alert-circle" %}Important 3 - {% include ui/icon.html icon="star" %}Starred + {% include_cached ui/icon.html icon="star" %}Starred - {% include ui/icon.html icon="file" %}Drafts + {% include_cached ui/icon.html icon="file" %}Drafts - {% include ui/icon.html icon="tag" %}Tags + {% include_cached ui/icon.html icon="tag" %}Tags - {% include ui/icon.html icon="trash" %}Trash + {% include_cached ui/icon.html icon="trash" %}Trash
    diff --git a/pages/gallery.html b/pages/gallery.html index 237a7704..f21652a6 100644 --- a/pages/gallery.html +++ b/pages/gallery.html @@ -22,11 +22,11 @@ menu: gallery
    - {% include ui/icon.html icon="eye" %} + {% include_cached ui/icon.html icon="eye" %} {{ forloop.index | random_number: 300, 600 }} - {% include ui/icon.html icon="heart" %} + {% include_cached ui/icon.html icon="heart" %} {{ forloop.index | random_number: 20, 100 }}
    diff --git a/pages/text.html b/pages/text.html index 2a6458a5..7366c209 100644 --- a/pages/text.html +++ b/pages/text.html @@ -8,7 +8,7 @@

    Lorem ipsum dolor sit amet

    Lorem ipsum dolor sit amet, consectetur adipisicing elit. Dignissimos dolor incidunt nisi optio provident quod recusandae repellendus repudiandae tenetur. Cupiditate dignissimos esse expedita fugiat impedit modi nostrum omnis quaerat quo. - {% include ui/button.html color="blue" size="sm" %} + {% include_cached ui/button.html color="blue" size="sm" %} Lorem ipsum dolor sit amet, consectetur adipisicing elit. Dignissimos dolor incidunt nisi optio provident quod recusandae repellendus repudiandae tenetur. Cupiditate dignissimos esse expedita fugiat impedit modi nostrum omnis quaerat quo.

    @@ -25,19 +25,19 @@

    Lorem ipsum dolor sit amet, consectetur adipisicing elit. Dignissimos dolor incidunt nisi optio provident quod recusandae repellendus repudiandae tenetur. Cupiditate dignissimos esse expedita fugiat impedit modi nostrum omnis quaerat quo.

    - {% include ui/button.html color="blue" %} - {% include ui/button.html color="danger" %} - {% include ui/button.html color="green" %} + {% include_cached ui/button.html color="blue" %} + {% include_cached ui/button.html color="danger" %} + {% include_cached ui/button.html color="green" %}
    - {% include ui/button.html color="blue" %} + {% include_cached ui/button.html color="blue" %} - {% include ui/button.html color="blue" size="sm" %} + {% include_cached ui/button.html color="blue" size="sm" %} - {% include ui/button.html color="blue" size="lg" %} + {% include_cached ui/button.html color="blue" size="lg" %}
    diff --git a/pages/users.html b/pages/users.html index c1690db9..a3fc50bf 100644 --- a/pages/users.html +++ b/pages/users.html @@ -26,8 +26,8 @@ menu: users {% comment %}
    - {% include ui/button.html color="twitter" icon="brand/twitter" icon-only=true outline=true %} - {% include ui/button.html color="facebook" icon="brand/facebook" icon-only=true outline=true %} + {% include_cached ui/button.html color="twitter" icon="brand/twitter" icon-only=true outline=true %} + {% include_cached ui/button.html color="facebook" icon="brand/facebook" icon-only=true outline=true %}
    {% endcomment %} @@ -47,8 +47,8 @@ menu: users
    - {% include ui/button.html text="Chat" color="secondary" size="sm" %} - {% include ui/button.html text="Profile" color="secondary" size="sm" %} + {% include_cached ui/button.html text="Chat" color="secondary" size="sm" %} + {% include_cached ui/button.html text="Profile" color="secondary" size="sm" %}
    -- GitLab