From c7c278651cdb50fe93cb2aa68306f6e50d76ebcf Mon Sep 17 00:00:00 2001 From: codecalm Date: Fri, 3 Apr 2020 14:05:40 +0200 Subject: [PATCH 01/31] icons disable on dev --- pages/icons.html | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pages/icons.html b/pages/icons.html index f564055bb..476a4e816 100644 --- a/pages/icons.html +++ b/pages/icons.html @@ -4,11 +4,10 @@ page-header: Icons ---
-
- {% include cards/icons.html title="Tabler icons" group="tabler" %} -
- {% if jekyll.environment == 'production' %} +
+ {% include cards/icons.html title="Tabler icons" group="tabler" %} +
{% include cards/icons.html title="Brand icons" group="brand" %}
From 71fbfdc8dc841dccd76690116cf45e58b8e3b5d8 Mon Sep 17 00:00:00 2001 From: codecalm Date: Sat, 4 Apr 2020 14:06:48 +0200 Subject: [PATCH 02/31] env clean --- _config.yml | 75 ++- pages/_includes/layout/content.html | 11 + pages/_includes/layout/css.html | 8 + pages/_layouts/base.html | 6 +- pages/_layouts/default.html | 14 +- scss/layout/_navbar.scss | 848 ++++++++++++++-------------- 6 files changed, 521 insertions(+), 441 deletions(-) create mode 100644 pages/_includes/layout/content.html diff --git a/_config.yml b/_config.yml index f12f43b8a..c2b2c258c 100644 --- a/_config.yml +++ b/_config.yml @@ -28,6 +28,69 @@ tabler-plugins: exclude: - .jekyll-cache + - 400.html + - 401.html + - 403.html + - 404.html + - 500.html + - 503.html + - all.html + - blog.html + - buttons.html + - calendar.html + - cards.html + - carousel.html + - changelog.html + - charts.html + - charts-heatmap.html + - components.html + - crypto-currencies.html + - docs.html + - dropdowns.html + - email.html + - favicon.ico + - flags.html + - forgot-password.html + - form-elements.html + - gallery.html + - icons.html + - index.html + - invoice.html + - license.html + - lists.html + - lookup.html + - maintenance.html + - maps.html + - maps-vector.html + - markdown.md + - modals.html + - music.html + - pagination.html + - pricing.html + - profile.html + - ribbons.html + - rtl.html + - search-results.html + - sign-in.html + - sign-up.html + - sitemap.xml + - snippets.html + - social.html + - store.html + - tables.html + - tabs.html + - terms-of-service.html + - tmp.html + - tmp2.html + - tmp3.html + - tmp4.html + - tmp-dark.html + - tmp-forms.html + - typography.html + - user-edit.html + - users.html + - welcome.html + keep_files: - css/ui-kit.css - css/dark.css @@ -48,12 +111,12 @@ toc: list_class: list-unstyled collections: - docs: - output: true - changelog: - output: false - components: - output: true +# docs: +# output: true +# changelog: +# output: false +# components: +# output: true defaults: - scope: diff --git a/pages/_includes/layout/content.html b/pages/_includes/layout/content.html new file mode 100644 index 000000000..8617d5ebd --- /dev/null +++ b/pages/_includes/layout/content.html @@ -0,0 +1,11 @@ +
+
+ {% if page-header %} + {% include layout/page-header.html title=page-header description=page.page-header-description actions=page.page-header-actions pretitle=page.page-header-pretitle %} + {% endif %} + + {{ content }} +
+ + {% include layout/footer.html %} +
\ No newline at end of file diff --git a/pages/_includes/layout/css.html b/pages/_includes/layout/css.html index 77034f6da..187b82347 100644 --- a/pages/_includes/layout/css.html +++ b/pages/_includes/layout/css.html @@ -1,3 +1,5 @@ +{% comment %} + {% if site.data.libs.css %} {% for lib in site.data.libs.css %} @@ -7,12 +9,18 @@ {% endfor %} {% endif %} +{% endcomment %} + +{% comment %} + {% for plugin in site.tabler-plugins %} {% endfor %} +{% endcomment %} + \ No newline at end of file diff --git a/pages/_layouts/base.html b/pages/_layouts/base.html index b0b1c6154..1be5de91b 100644 --- a/pages/_layouts/base.html +++ b/pages/_layouts/base.html @@ -8,6 +8,7 @@ {% if page.title %}{{ page.title }} - {% endif %}{% if layout.title %}{{ layout.title }} - {% endif %}{% if site.title %}{{ site.title }} - {% endif %}{{ site.description }} + {% if jekyll.environment == 'production' %} @@ -32,6 +33,8 @@ {% endif %} {% include layout/og.html show=layout.og-component %} + {% endif %} + {% include layout/css.html %} -{% assign dark-theme = page.dark-theme | default: site.dark-theme %} - +{% assign layout-dark = page.layout-dark | default: site.layout-dark %} + {{ content }} diff --git a/pages/_layouts/default.html b/pages/_layouts/default.html index c467ddb7f..96206498f 100644 --- a/pages/_layouts/default.html +++ b/pages/_layouts/default.html @@ -2,8 +2,15 @@ layout: base --- +{% if page.layout-sidebar %} + {% include layout/sidebar.html dark=page.layout-sidebar-dark right=page.layout-sidebar-right %} +{% endif %} +
- {% include layout/navbar.html secondary=true %} + {% unless page.layout-hide-topbar %} + {% include layout/navbar.html condensed=page.layout-navbar-condensed dark=page.layout-navbar-dark hide-brand=page.layout-navbar-hide-brand hide-menu=page.layout-navbar-hide-menu class=page.layout-navbar-class %} + {% endunless %} + {% include layout/content.html %}
diff --git a/pages/layout-combo.html b/pages/layout-combo.html new file mode 100644 index 000000000..e94b37eab --- /dev/null +++ b/pages/layout-combo.html @@ -0,0 +1,12 @@ +--- +page-header: Combo layout +menu: layout.combo +layout-sidebar: true +layout-sidebar-dark: true +layout-navbar-hide-brand: true +layout-navbar-hide-menu: true +layout-navbar-class: "d-none d-lg-flex" +layout-navbar-condensed: true +--- + +{% include layout/homepage.html %} \ No newline at end of file diff --git a/pages/layout-condensed-dark.html b/pages/layout-condensed-dark.html new file mode 100644 index 000000000..18c7e0e2f --- /dev/null +++ b/pages/layout-condensed-dark.html @@ -0,0 +1,8 @@ +--- +page-header: Condensed dark layout +menu: layout.condensed-dark +layout-navbar-condensed: true +layout-navbar-dark: true +--- + +{% include layout/homepage.html %} \ No newline at end of file diff --git a/pages/layout-condensed.html b/pages/layout-condensed.html new file mode 100644 index 000000000..d0fecf66a --- /dev/null +++ b/pages/layout-condensed.html @@ -0,0 +1,7 @@ +--- +page-header: Condensed layout +menu: layout.condensed +layout-navbar-condensed: true +--- + +{% include layout/homepage.html %} \ No newline at end of file diff --git a/pages/layout-dark.html b/pages/layout-dark.html new file mode 100644 index 000000000..6757b95f2 --- /dev/null +++ b/pages/layout-dark.html @@ -0,0 +1,7 @@ +--- +page-header: Dark mode +menu: layout.dark-mode +layout-dark: true +--- + +{% include layout/homepage.html %} diff --git a/pages/layout-fluid.html b/pages/layout-fluid.html new file mode 100644 index 000000000..3a3dfc6c3 --- /dev/null +++ b/pages/layout-fluid.html @@ -0,0 +1,7 @@ +--- +page-header: Fluid layout +menu: layout.fluid +layout-fluid: true +--- + +{% include layout/homepage.html %} diff --git a/pages/layout-horizontal.html b/pages/layout-horizontal.html new file mode 100644 index 000000000..055801999 --- /dev/null +++ b/pages/layout-horizontal.html @@ -0,0 +1,6 @@ +--- +page-header: Horizontal layout +menu: layout.horizontal +--- + +{% include layout/homepage.html %} \ No newline at end of file diff --git a/pages/layout-navbar-dark.html b/pages/layout-navbar-dark.html new file mode 100644 index 000000000..b9132dd3a --- /dev/null +++ b/pages/layout-navbar-dark.html @@ -0,0 +1,7 @@ +--- +page-header: Navbar dark +menu: layout.navbar-dark +layout-navbar-dark: true +--- + +{% include layout/homepage.html %} \ No newline at end of file diff --git a/pages/layout-vertical-right.html b/pages/layout-vertical-right.html new file mode 100644 index 000000000..c0e670a26 --- /dev/null +++ b/pages/layout-vertical-right.html @@ -0,0 +1,9 @@ +--- +page-header: Right vertical layout +menu: layout.vertical-right +layout-sidebar: true +layout-sidebar-right: true +layout-hide-topbar: true +--- + +{% include layout/homepage.html %} \ No newline at end of file diff --git a/pages/layout-vertical.html b/pages/layout-vertical.html new file mode 100644 index 000000000..7fec1e06b --- /dev/null +++ b/pages/layout-vertical.html @@ -0,0 +1,9 @@ +--- +page-header: Vertical layout +menu: layout.vertical +layout-sidebar: true +layout-sidebar-dark: true +layout-hide-topbar: true +--- + +{% include layout/homepage.html %} \ No newline at end of file diff --git a/scss/ui/_nav.scss b/scss/ui/_nav.scss index 8a5749ce9..0e7705ed0 100644 --- a/scss/ui/_nav.scss +++ b/scss/ui/_nav.scss @@ -62,7 +62,7 @@ } .nav-link-icon { - width: 1.5rem; + width: 1.25rem; height: 1rem; font-size: 1rem; From 1fa65b35645f41a9da41182e3240519b9b73c192 Mon Sep 17 00:00:00 2001 From: codecalm Date: Fri, 10 Apr 2020 22:38:04 +0200 Subject: [PATCH 29/31] container fix --- pages/_includes/layout/content.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pages/_includes/layout/content.html b/pages/_includes/layout/content.html index 9193887b9..e06b75b99 100644 --- a/pages/_includes/layout/content.html +++ b/pages/_includes/layout/content.html @@ -1,7 +1,7 @@ {% assign page-header = page.page-header | default: layout.page-header %}
-
+
{% if page-header %} {% include layout/page-header.html title=page-header description=page.page-header-description actions=page.page-header-actions pretitle=page.page-header-pretitle %} {% endif %} From a78a0b03177bd86b725cc40025b83052fce93bb4 Mon Sep 17 00:00:00 2001 From: codecalm Date: Fri, 10 Apr 2020 22:43:30 +0200 Subject: [PATCH 30/31] auto-open layout --- pages/_data/menu.yml | 3 +++ pages/_includes/layout/navbar-menu.html | 5 ++--- pages/_includes/layout/sidebar.html | 2 +- pages/layout-fluid-vertical.html | 10 ++++++++++ 4 files changed, 16 insertions(+), 4 deletions(-) create mode 100644 pages/layout-fluid-vertical.html diff --git a/pages/_data/menu.yml b/pages/_data/menu.yml index 46459c1e7..b7c8c8c64 100644 --- a/pages/_data/menu.yml +++ b/pages/_data/menu.yml @@ -165,6 +165,9 @@ layout: fluid: url: layout-fluid.html title: Fluid + fluid-vertical: + url: layout-fluid-vertical.html + title: Fluid vertical docs: title: Docs diff --git a/pages/_includes/layout/navbar-menu.html b/pages/_includes/layout/navbar-menu.html index c9463bdf7..d529faf73 100644 --- a/pages/_includes/layout/navbar-menu.html +++ b/pages/_includes/layout/navbar-menu.html @@ -10,8 +10,7 @@ {% for level-1 in menu %} {% assign icon = level-1[1].icon %}
  • - + {% unless hide-icons %} {% include ui/icon.html icon=icon %} {% endunless %} @@ -30,7 +29,7 @@ {% if level-1[1].children %} -