From 738eff385dde1bfe9024d551000402177f75de4e Mon Sep 17 00:00:00 2001 From: codecalm Date: Sun, 9 Feb 2020 16:49:37 +0100 Subject: [PATCH] tabler customize --- build/rollup.config.js | 3 - js/tabler-range-sliders.js | 12 - js/tabler.js | 8 +- package.json | 4 +- pages/_docs/payments.md | 4 +- pages/_includes/cards/company-employees.html | 2 +- .../_includes/cards/development-activity.html | 10 +- pages/_includes/cards/invoices.html | 4 +- pages/_includes/cards/table-users.html | 4 +- pages/_includes/forms/form-elements-4.html | 6 +- pages/_includes/layout/customize.html | 79 ------- pages/_includes/layout/footer.html | 42 ++-- pages/_includes/layout/homepage.html | 2 - pages/_includes/layout/js.html | 1 - pages/_includes/layout/navbar-menu.html | 4 +- pages/_includes/layout/navbar-primary.html | 7 +- pages/_includes/layout/navbar-search.html | 2 +- pages/_includes/parts/modals/customize.html | 205 ++++++++++++++++++ pages/_includes/parts/modals/simple.html | 7 +- pages/_includes/ui/modal.html | 2 +- pages/_includes/ui/modal/header.html | 6 + pages/_layouts/base.html | 10 +- pages/_layouts/default.html | 2 + pages/empty.html | 2 - scss/_dark.scss | 7 +- scss/_utilities.scss | 11 + scss/_variables.scss | 10 +- scss/demo.scss | 6 +- scss/layout/_footer.scss | 9 + scss/layout/_navbar.scss | 8 +- scss/layout/_page.scss | 4 +- scss/ui/_forms.scss | 4 + scss/ui/_modals.scss | 12 +- scss/utils/_sizing.scss | 23 +- 34 files changed, 324 insertions(+), 198 deletions(-) delete mode 100644 js/tabler-range-sliders.js delete mode 100644 pages/_includes/layout/customize.html create mode 100644 pages/_includes/parts/modals/customize.html create mode 100644 pages/_includes/ui/modal/header.html diff --git a/build/rollup.config.js b/build/rollup.config.js index 597351cb..2a643878 100644 --- a/build/rollup.config.js +++ b/build/rollup.config.js @@ -40,12 +40,9 @@ module.exports = { context: "window", input: { tabler: path.resolve(__dirname, '../js/tabler.js'), - // 'tabler-charts': path.resolve(__dirname, '../js/tabler-charts.js'), - 'tabler-range-sliders': path.resolve(__dirname, '../js/tabler-range-sliders.js') }, output: { banner, - // name: 'tabler', dir: path.resolve(__dirname, `../${dir}/js/`), entryFileNames: BUNDLE ? '[name].min.js' : '[name].js', format: 'cjs' diff --git a/js/tabler-range-sliders.js b/js/tabler-range-sliders.js deleted file mode 100644 index 5f245d01..00000000 --- a/js/tabler-range-sliders.js +++ /dev/null @@ -1,12 +0,0 @@ -/* Demo only */ - -$(document).ready(function() { - - /* Sliders value */ - let slidersText = document.querySelectorAll('[demo-slider]'); - for(let i = 0;i {{ payment.name }} {{ payment.logo }} - {% include ui/payment.html payment=payment.logo %} - {% include ui/payment.html payment=payment.logo dark=true %} + {% include ui/payment.html payment=payment.logo %} + {% include ui/payment.html payment=payment.logo dark=true %} {% endfor %} diff --git a/pages/_includes/cards/company-employees.html b/pages/_includes/cards/company-employees.html index 18c2aba8..7dabfb7b 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 ui/avatar.html src=person.photo %} + {% include ui/avatar.html src=person.photo %} {{ person.full_name }} {{ person.department }} {{ forloop.index | random_number: 30, 90 }}% diff --git a/pages/_includes/cards/development-activity.html b/pages/_includes/cards/development-activity.html index c07357d5..bf7f8d08 100644 --- a/pages/_includes/cards/development-activity.html +++ b/pages/_includes/cards/development-activity.html @@ -12,7 +12,7 @@ - + {% include ui/avatar.html person-id=10 %} {{ site.data.people[10].full_name }} @@ -20,7 +20,7 @@ May 6, 2019 - + {% include ui/avatar.html person-id=17 %} {{ site.data.people[17].full_name }} @@ -28,7 +28,7 @@ April 22, 2019 - + {% include ui/avatar.html person-id=16 %} {{ site.data.people[16].full_name }} @@ -36,7 +36,7 @@ April 15, 2019 - + {% include ui/avatar.html person-id=12 %} {{ site.data.people[12].full_name }} @@ -44,7 +44,7 @@ April 8, 2019 - + {% include ui/avatar.html person-id=19 %} {{ site.data.people[19].full_name }} diff --git a/pages/_includes/cards/invoices.html b/pages/_includes/cards/invoices.html index c01a7b9a..280f4c92 100644 --- a/pages/_includes/cards/invoices.html +++ b/pages/_includes/cards/invoices.html @@ -26,8 +26,8 @@ - - + + diff --git a/pages/_includes/cards/table-users.html b/pages/_includes/cards/table-users.html index 5cd58368..7b06f613 100644 --- a/pages/_includes/cards/table-users.html +++ b/pages/_includes/cards/table-users.html @@ -7,7 +7,7 @@ - + @@ -19,7 +19,7 @@ {% assign percentage_color = percentage | number_color %} -
No. {% include ui/icon.html icon="chevron-up" class="icon-sm text-dark icon-thick" %}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" %}Usage Payment ActivitySatisfactionSatisfaction
+ {% include ui/avatar.html person-id=person.id %} diff --git a/pages/_includes/forms/form-elements-4.html b/pages/_includes/forms/form-elements-4.html index c24f04b5..627eaa58 100644 --- a/pages/_includes/forms/form-elements-4.html +++ b/pages/_includes/forms/form-elements-4.html @@ -6,7 +6,7 @@
-
+
@@ -16,7 +16,7 @@
-
+
@@ -41,7 +41,7 @@
-
+
{% assign icons = "bold,italic,underline,copy,scissors,file-plus,file-minus" | split: ',' %} {% for icon in icons %} {% include ui/button.html color="secondary" icon=icon icon-only=true %} diff --git a/pages/_includes/layout/customize.html b/pages/_includes/layout/customize.html deleted file mode 100644 index 96219fed..00000000 --- a/pages/_includes/layout/customize.html +++ /dev/null @@ -1,79 +0,0 @@ -
-
-
-
-
- Toggle sidebar - Sidebar narrow - Sidebar left/right - Sidebar color - Secondary color - Toggle secondary - Dark mode -
-
-
-
-
- -{% capture_global scripts %} - -{% endcapture_global %} \ No newline at end of file diff --git a/pages/_includes/layout/footer.html b/pages/_includes/layout/footer.html index 93696bf2..65ff4330 100644 --- a/pages/_includes/layout/footer.html +++ b/pages/_includes/layout/footer.html @@ -1,26 +1,24 @@ -
-
-
-
-
-
-
- -
-
- {% include ui/button.html color="secondary" size="sm" text="Source code" href=site.github_url external=true %} -
+
+
+
+
+
+
+ +
+
+ {% include ui/button.html color="secondary" size="sm" text="Source code" href=site.github_url external=true %}
-
- Copyright © {{ site.time | date: '%Y' }} - {{ site.title }}. - All rights reserved. -
+
+
+ Copyright © {{ site.time | date: '%Y' }} + {{ site.title }}. + All rights reserved.
-
-
\ No newline at end of file +
+
\ No newline at end of file diff --git a/pages/_includes/layout/homepage.html b/pages/_includes/layout/homepage.html index 8a0fb372..65917b9e 100644 --- a/pages/_includes/layout/homepage.html +++ b/pages/_includes/layout/homepage.html @@ -1,5 +1,3 @@ -{% include layout/customize.html %} -
{% include cards/charts/sales.html %} diff --git a/pages/_includes/layout/js.html b/pages/_includes/layout/js.html index 1a133c3e..00da6780 100644 --- a/pages/_includes/layout/js.html +++ b/pages/_includes/layout/js.html @@ -10,4 +10,3 @@ - diff --git a/pages/_includes/layout/navbar-menu.html b/pages/_includes/layout/navbar-menu.html index f790356c..948b1eb9 100644 --- a/pages/_includes/layout/navbar-menu.html +++ b/pages/_includes/layout/navbar-menu.html @@ -32,8 +32,8 @@ {% endfor %} -
  • - +
  • + {% include ui/icon.html icon="sliders" %} Customize diff --git a/pages/_includes/layout/navbar-primary.html b/pages/_includes/layout/navbar-primary.html index 2be55a5a..6b254ecf 100644 --- a/pages/_includes/layout/navbar-primary.html +++ b/pages/_includes/layout/navbar-primary.html @@ -9,9 +9,10 @@
    Tools
    -
    - {% include layout/navbar-search.html %} - {% include ui/button.html text="Customize" icon="sliders" color="primary" block=true class="d-none-navbar-horizontal" %} +
    + {% include layout/navbar-search.html class="d-none-navbar-vertical-narrow" %} + {% include ui/button.html text="Customize" icon="sliders" color="primary" block=true modal-id="customize" class="d-none-navbar-horizontal d-none-navbar-vertical-narrow" %} + {% include ui/button.html icon="sliders" icon-only=true color="primary" block=true modal-id="customize" class="d-none-navbar-horizontal d-none-navbar-vertical-wide" %}
    • diff --git a/pages/_includes/layout/navbar-search.html b/pages/_includes/layout/navbar-search.html index ebdfc7b7..d4982e69 100644 --- a/pages/_includes/layout/navbar-search.html +++ b/pages/_includes/layout/navbar-search.html @@ -1,4 +1,4 @@ -
    +
    {% include ui/form/input-icon.html prepend=true %}
    diff --git a/pages/_includes/parts/modals/customize.html b/pages/_includes/parts/modals/customize.html new file mode 100644 index 00000000..654fac60 --- /dev/null +++ b/pages/_includes/parts/modals/customize.html @@ -0,0 +1,205 @@ +{% include ui/modal/header.html title="Customize Tabler" %} + +
    +

    Set preferences that will be saved for your live preview.

    + +
    + +
    Light or dark presentation.
    + +
    + + +
    +
    + +
    + You can use the .theme-dark-auto class to automatically adjust the color version to the system settings. +
    + +
    + +
    Choose where the main navigation in your project should be located.
    + +
    + + + +
    +
    + +
    + +
    Standard sidebar width or narrow version with icons only.
    + +
    + + +
    +
    + +
    + +
    Choose whether the sidebar should appear on the left or on the right.
    + +
    + + +
    +
    + +
    + +
    Light or dark version of the sidebar
    + +
    + + +
    +
    +
    + +{% capture_global scripts %} + +{% endcapture_global %} \ No newline at end of file diff --git a/pages/_includes/parts/modals/simple.html b/pages/_includes/parts/modals/simple.html index 2a0f6beb..f82c2941 100644 --- a/pages/_includes/parts/modals/simple.html +++ b/pages/_includes/parts/modals/simple.html @@ -1,9 +1,4 @@ -
    -
    Modal title
    - -
    +{% include ui/modal/header.html %}
    Lorem ipsum dolor sit amet, consectetur adipisicing elit. Adipisci animi beatae delectus deleniti dolorem eveniet facere fuga iste nemo nesciunt nihil odio perspiciatis, quia quis reprehenderit sit tempora totam unde.
    diff --git a/pages/_includes/ui/modal.html b/pages/_includes/ui/modal.html index 8dd9fd81..ef6e3426 100644 --- a/pages/_includes/ui/modal.html +++ b/pages/_includes/ui/modal.html @@ -2,7 +2,7 @@ {% capture_global modals %}