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 @@
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 @@
- {% 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 @@