From 22e5fcb70ec31e9695b57142dc8a4c7a3de03753 Mon Sep 17 00:00:00 2001 From: codecalm Date: Sun, 29 Nov 2020 16:05:54 +0100 Subject: [PATCH] newest bootstrap `data-XXX` => `data-bs-XXX` fixes --- src/js/autosize.js | 2 +- src/js/dropdown.js | 2 +- src/js/tabler.js | 8 +++--- src/pages/_docs/buttons.md | 6 ++--- src/pages/_docs/form-helpers.md | 2 +- src/pages/_docs/tooltips.md | 10 +++---- src/pages/_includes/cards/card-tabs.html | 2 +- src/pages/_includes/cards/comments.html | 4 +-- src/pages/_includes/cards/icons.html | 4 +-- src/pages/_includes/cards/invoices.html | 2 +- .../_includes/cards/most-visited-pages.html | 2 +- .../_includes/cards/music/tracks-list.html | 2 +- src/pages/_includes/cards/profile-2.html | 6 ++--- src/pages/_includes/cards/social-traffic.html | 2 +- src/pages/_includes/cards/tabs.html | 14 +++++----- src/pages/_includes/cards/tasks.html | 2 +- src/pages/_includes/docs/menu.html | 2 +- .../_includes/forms/form-elements-1.html | 6 ++--- .../_includes/forms/form-elements-4.html | 2 +- src/pages/_includes/layout/navbar-logo.html | 27 ++++++++++++++----- src/pages/_includes/layout/navbar-menu.html | 6 ++--- src/pages/_includes/layout/navbar-side.html | 4 +-- .../_includes/layout/navbar-toggler.html | 2 +- src/pages/_includes/layout/navbar.html | 2 +- src/pages/_includes/layout/sidebar.html | 2 +- src/pages/_includes/parts/dropdown/days.html | 2 +- src/pages/_includes/ui/avatar.html | 2 +- src/pages/_includes/ui/button.html | 2 +- src/pages/_includes/ui/card-dropdown.html | 2 +- src/pages/_includes/ui/form/input-group.html | 2 +- .../_includes/ui/form/textarea-autosize.html | 2 +- src/pages/_includes/ui/steps.html | 2 +- src/pages/_includes/ui/switch-icon.html | 2 +- src/pages/_includes/ui/table.html | 2 +- src/pages/_includes/ui/toast.html | 2 +- src/scss/layout/_navbar.scss | 1 + 36 files changed, 79 insertions(+), 65 deletions(-) diff --git a/src/js/autosize.js b/src/js/autosize.js index 6bb5ed20..fcf4a663 100644 --- a/src/js/autosize.js +++ b/src/js/autosize.js @@ -2,7 +2,7 @@ import autosize from 'autosize'; -const elements = document.querySelectorAll('[data-toggle="autosize"]'); +const elements = document.querySelectorAll('[data-bs-toggle="autosize"]'); if (elements.length) { elements.forEach(function (element) { autosize(element); diff --git a/src/js/dropdown.js b/src/js/dropdown.js index 662bed66..0eabae99 100644 --- a/src/js/dropdown.js +++ b/src/js/dropdown.js @@ -9,7 +9,7 @@ dropdowns.forEach(dropdown => { dropdown.addEventListener('mousedown', (e) => { e.stopPropagation(); - if (e.target.dataset.toggle && e.target.dataset.toggle === 'dropdown') { + if (e.target.dataset.bsToggle && e.target.dataset.bsToggle === 'dropdown') { currentTarget = e.currentTarget; } }); diff --git a/src/js/tabler.js b/src/js/tabler.js index 626e2c1a..75d09292 100644 --- a/src/js/tabler.js +++ b/src/js/tabler.js @@ -7,7 +7,7 @@ import './dropdown'; (function() { /** */ - let tooltipTriggerList = [].slice.call(document.querySelectorAll('[data-toggle="tooltip"]')); + let tooltipTriggerList = [].slice.call(document.querySelectorAll('[data-bs-toggle="tooltip"]')); tooltipTriggerList.map(function (tooltipTriggerEl) { let options = { delay: {show: 50, hide: 50}, @@ -19,7 +19,7 @@ import './dropdown'; /** */ - let popoverTriggerList = [].slice.call(document.querySelectorAll('[data-toggle="popover"]')); + let popoverTriggerList = [].slice.call(document.querySelectorAll('[data-bs-toggle="popover"]')); popoverTriggerList.map(function (popoverTriggerEl) { let options = { delay: {show: 50, hide: 50}, @@ -29,13 +29,13 @@ import './dropdown'; return new bootstrap.Popover(popoverTriggerEl, options); }); - let dropdownTriggerList = [].slice.call(document.querySelectorAll('[data-toggle="dropdown"]')); + let dropdownTriggerList = [].slice.call(document.querySelectorAll('[data-bs-toggle="dropdown"]')); dropdownTriggerList.map(function (dropdownTriggerEl) { return new bootstrap.Dropdown(dropdownTriggerEl); }); - let switchesTriggerList = [].slice.call(document.querySelectorAll('[data-toggle="switch-icon"]')); + let switchesTriggerList = [].slice.call(document.querySelectorAll('[data-bs-toggle="switch-icon"]')); switchesTriggerList.map(function (switchTriggerEl) { switchTriggerEl.addEventListener('click', (e) => { e.stopPropagation(); diff --git a/src/pages/_docs/buttons.md b/src/pages/_docs/buttons.md index 613f5541..4d6bb15d 100644 --- a/src/pages/_docs/buttons.md +++ b/src/pages/_docs/buttons.md @@ -225,21 +225,21 @@ Create a dropdown button that will encourage users to click for more options. Yo {% capture code %}
- {% include ui/dropdown-menu.html %}
- {% include ui/dropdown-menu.html %}
- {% include ui/dropdown-menu.html %} diff --git a/src/pages/_docs/form-helpers.md b/src/pages/_docs/form-helpers.md index 0d68882a..c8eb456e 100644 --- a/src/pages/_docs/form-helpers.md +++ b/src/pages/_docs/form-helpers.md @@ -10,6 +10,6 @@ menu: docs.components.form-helpers Use an input helper to display additional information about a form element. The text label will appear once a user hovers over the helper. {% capture code %} -? +? {% endcapture %} {% include example.html code=code %} diff --git a/src/pages/_docs/tooltips.md b/src/pages/_docs/tooltips.md index f9efd8b0..41cdea90 100644 --- a/src/pages/_docs/tooltips.md +++ b/src/pages/_docs/tooltips.md @@ -11,16 +11,16 @@ bootstrap-link: components/tooltips/ Use the default markup to create tooltips that will help users understand particular elements of your interface. You can decide where the text label is to be displayed - at the top, bottom or on either side of the element. {% capture code %} - - - - {% endcapture %} @@ -32,7 +32,7 @@ Use the default markup to create tooltips that will help users understand partic If the default tooltip is not enough, you can add the option to use HTML code in the text to highlight particular bits of information and make the content more attractive. {% capture code %} - {% endcapture %} diff --git a/src/pages/_includes/cards/card-tabs.html b/src/pages/_includes/cards/card-tabs.html index 0fa7a213..03e5d44f 100644 --- a/src/pages/_includes/cards/card-tabs.html +++ b/src/pages/_includes/cards/card-tabs.html @@ -6,7 +6,7 @@ {% endcapture %} diff --git a/src/pages/_includes/cards/comments.html b/src/pages/_includes/cards/comments.html index 9cc58e79..483137b0 100644 --- a/src/pages/_includes/cards/comments.html +++ b/src/pages/_includes/cards/comments.html @@ -21,8 +21,8 @@

+{{ forloop.index | random_number: 20, 50 }} - {% include ui/icon.html icon="chevron-up" %} - + {% include ui/icon.html icon="chevron-up" %} + {% include ui/icon.html icon="chevron-down" %} · diff --git a/src/pages/_includes/cards/icons.html b/src/pages/_includes/cards/icons.html index 02f44b8b..66b68c7c 100644 --- a/src/pages/_includes/cards/icons.html +++ b/src/pages/_includes/cards/icons.html @@ -27,7 +27,7 @@
{% for icon in icons limit: limit %} - + {% include ui/icon.html icon=icon %}
{{ icon }}
 @@ -52,7 +52,7 @@ }; (function () { - const elements = document.querySelectorAll('[data-toggle-icon]'); + const elements = document.querySelectorAll('[data-bs-toggle-icon]'); if (elements.length) { elements.forEach(function (element) { diff --git a/src/pages/_includes/cards/invoices.html b/src/pages/_includes/cards/invoices.html index 262122d0..cd711269 100644 --- a/src/pages/_includes/cards/invoices.html +++ b/src/pages/_includes/cards/invoices.html @@ -61,7 +61,7 @@ - + {% include ui/dropdown-menu.html right=true %} diff --git a/src/pages/_includes/cards/most-visited-pages.html b/src/pages/_includes/cards/most-visited-pages.html index 0689c207..317a4590 100644 --- a/src/pages/_includes/cards/most-visited-pages.html +++ b/src/pages/_includes/cards/most-visited-pages.html @@ -1,6 +1,6 @@
-

Most Visited Pages

+

Most Visited Pages

diff --git a/src/pages/_includes/cards/music/tracks-list.html b/src/pages/_includes/cards/music/tracks-list.html index 048f8368..b4377db7 100644 --- a/src/pages/_includes/cards/music/tracks-list.html +++ b/src/pages/_includes/cards/music/tracks-list.html @@ -27,7 +27,7 @@
- {% include ui/icon.html icon="dots" %} + {% include ui/icon.html icon="dots" %} {% include ui/dropdown-menu.html right=true %}
diff --git a/src/pages/_includes/cards/profile-2.html b/src/pages/_includes/cards/profile-2.html index 86c535e2..52778725 100644 --- a/src/pages/_includes/cards/profile-2.html +++ b/src/pages/_includes/cards/profile-2.html @@ -8,17 +8,17 @@
diff --git a/src/pages/_includes/cards/tabs.html b/src/pages/_includes/cards/tabs.html index 3169c0f5..6175ae41 100644 --- a/src/pages/_includes/cards/tabs.html +++ b/src/pages/_includes/cards/tabs.html @@ -9,35 +9,35 @@ {% assign reverse = include.reverse | default: false %}
-
diff --git a/src/pages/_includes/docs/menu.html b/src/pages/_includes/docs/menu.html index f3474800..d61e6711 100644 --- a/src/pages/_includes/docs/menu.html +++ b/src/pages/_includes/docs/menu.html @@ -11,7 +11,7 @@ {% assign current-item = true %} {% endif %} - + {% if item.icon %} {% include ui/icon.html icon=item.icon %} {% endif %} diff --git a/src/pages/_includes/forms/form-elements-1.html b/src/pages/_includes/forms/form-elements-1.html index 2812cec2..69876021 100644 --- a/src/pages/_includes/forms/form-elements-1.html +++ b/src/pages/_includes/forms/form-elements-1.html @@ -31,7 +31,7 @@
- {% include ui/dropdown-menu.html %} @@ -43,7 +43,7 @@
- + {% include ui/dropdown-menu.html right=true %}
@@ -59,7 +59,7 @@
- ?
diff --git a/src/pages/_includes/forms/form-elements-4.html b/src/pages/_includes/forms/form-elements-4.html index ece97cd7..67ba5ea7 100644 --- a/src/pages/_includes/forms/form-elements-4.html +++ b/src/pages/_includes/forms/form-elements-4.html @@ -21,7 +21,7 @@
-
diff --git a/src/pages/_includes/layout/navbar-logo.html b/src/pages/_includes/layout/navbar-logo.html index 697faaa1..e7830d88 100644 --- a/src/pages/_includes/layout/navbar-logo.html +++ b/src/pages/_includes/layout/navbar-logo.html @@ -1,16 +1,29 @@ {% assign prefix = include.prefix | default: 'navbar' %} {% assign breakpoint = include.breakpoint | default: 'lg' %} - - {% unless include.hide-logo %} +{% capture class-attr %}class="{{ prefix }}-brand {{ prefix }}-brand-autodark{% if include.class %} {{ include.class }}{% endif %}"{% endcapture %} + +{% if include.header %} +

+ +{% else %} + +{% endif %} + {% unless include.hide-logo %} {% if include.small-logo %} - {{ site.title }} + {{ site.title }} {% else %} - {{ site.title }} + {{ site.title }} {% endif %} - {% endunless %} + {% endunless %} - {% if include.show-title %} + {% if include.show-title %} Dashboard - {% endif %} + {% endif %} + +{% if include.header %} + +

+{% else %} +{% endif %} \ No newline at end of file diff --git a/src/pages/_includes/layout/navbar-menu.html b/src/pages/_includes/layout/navbar-menu.html index 2e968168..bd57d08e 100644 --- a/src/pages/_includes/layout/navbar-menu.html +++ b/src/pages/_includes/layout/navbar-menu.html @@ -11,7 +11,7 @@ {% for level-1 in menu %} {% assign icon = level-1[1].icon %}
  • - + {% unless hide-icons %} {% include ui/icon.html icon=icon %} {% endunless %} @@ -47,7 +47,7 @@ {% if level-2[1].children %}
    {% endif %} - @@ -70,7 +70,7 @@ {% comment %}
  • - + {% include ui/icon.html icon="adjustments" %} Customize diff --git a/src/pages/_includes/layout/navbar-side.html b/src/pages/_includes/layout/navbar-side.html index f651c290..b58b94dc 100644 --- a/src/pages/_includes/layout/navbar-side.html +++ b/src/pages/_includes/layout/navbar-side.html @@ -2,7 +2,7 @@ {% assign person = site.data.people[person-id] %}
    - + {% include ui/icon.html icon="bell" %} @@ -12,7 +12,7 @@
    - + {% include ui/avatar.html person-id=person-id size="sm" %} {% unless include.hide-username %} diff --git a/src/pages/_includes/layout/navbar-toggler.html b/src/pages/_includes/layout/navbar-toggler.html index 75beffe5..649a33ed 100644 --- a/src/pages/_includes/layout/navbar-toggler.html +++ b/src/pages/_includes/layout/navbar-toggler.html @@ -1,3 +1,3 @@ - \ No newline at end of file diff --git a/src/pages/_includes/layout/navbar.html b/src/pages/_includes/layout/navbar.html index 0f76e5d8..406401f8 100644 --- a/src/pages/_includes/layout/navbar.html +++ b/src/pages/_includes/layout/navbar.html @@ -10,7 +10,7 @@ {% include layout/navbar-toggler.html target="navbar-menu" %} {% unless include.hide-brand %} - {% include layout/navbar-logo.html dark=include.dark small-logo=include.small-logo hide-logo=include.hide-logo class="d-none-navbar-horizontal pr-0 pr-md-3" breakpoint=breakpoint show-title=include.show-title %} + {% include layout/navbar-logo.html dark=include.dark small-logo=include.small-logo hide-logo=include.hide-logo class="d-none-navbar-horizontal pr-0 pr-md-3" breakpoint=breakpoint show-title=include.show-title header=true %} {% endunless %} {% include layout/navbar-side.html class="order-md-last" hide-username=include.hide-username person-id=include.person-id %} diff --git a/src/pages/_includes/layout/sidebar.html b/src/pages/_includes/layout/sidebar.html index c28b0890..372364dd 100644 --- a/src/pages/_includes/layout/sidebar.html +++ b/src/pages/_includes/layout/sidebar.html @@ -5,7 +5,7 @@ {% include layout/navbar-toggler.html target="navbar-menu" %} {% unless include.hide-brand %} - {% include layout/navbar-logo.html dark=include.dark breakpoint=breakpoint %} + {% include layout/navbar-logo.html dark=include.dark breakpoint=breakpoint header=true %} {% endunless %} {% include layout/navbar-side.html class="d-lg-none" hide-username=include.hide-username person-id=include.person-id %} diff --git a/src/pages/_includes/parts/dropdown/days.html b/src/pages/_includes/parts/dropdown/days.html index 2aa4d41a..d41efbef 100644 --- a/src/pages/_includes/parts/dropdown/days.html +++ b/src/pages/_includes/parts/dropdown/days.html @@ -1,5 +1,5 @@
    - +
    Last 7 days Last 30 days diff --git a/src/pages/_includes/ui/avatar.html b/src/pages/_includes/ui/avatar.html index 71e9a07b..cde3aa09 100644 --- a/src/pages/_includes/ui/avatar.html +++ b/src/pages/_includes/ui/avatar.html @@ -21,6 +21,6 @@ {% endif %} {% assign el = 'span' %} {% if link %}{% assign el = 'a' %}{% endif %} -<{{ el }} class="avatar{% if include['size'] %} avatar-{{ include['size'] }}{% endif %}{% if include.thumb %} avatar-thumb{% endif %}{% if include.class %} {{ include.class }}{% endif %}{% if include.shape %} {{ include.shape }}{% endif %}{% if include.color %} bg-{{ include.color }}-lt{% endif %}{% if include.rounded %} avatar-rounded{% endif %}"{% if src %} style="background-image: url({{ site.base }}/{{ src }})"{% endif %}{% if include.dropdown %} data-toggle="dropdown"{% endif %}>{% if include.status %} +<{{ el }} class="avatar{% if include['size'] %} avatar-{{ include['size'] }}{% endif %}{% if include.thumb %} avatar-thumb{% endif %}{% if include.class %} {{ include.class }}{% endif %}{% if include.shape %} {{ include.shape }}{% endif %}{% if include.color %} bg-{{ include.color }}-lt{% endif %}{% if include.rounded %} avatar-rounded{% endif %}"{% if src %} style="background-image: url({{ site.base }}/{{ src }})"{% endif %}{% if include.dropdown %} data-bs-toggle="dropdown"{% endif %}>{% if include.status %} {% if include.status-text %}{{ include.status-text }}{% elsif include.status-icon %}{% include ui/icon.html icon=include.status-icon class="avatar-status-icon" %}{% endif %}{% endif %}{% if placeholder %}{{ placeholder }}{% elsif include.icon %}{% include ui/icon.html icon=include.icon class="avatar-icon" %}{% endif %} {% endremoveemptylines %} diff --git a/src/pages/_includes/ui/button.html b/src/pages/_includes/ui/button.html index 80403dad..97b01140 100644 --- a/src/pages/_includes/ui/button.html +++ b/src/pages/_includes/ui/button.html @@ -19,7 +19,7 @@ {% endif %} {% assign e = include.element | default: 'a' %} -<{{ e }}{% if e == 'a' %} href="{{ href }}"{% endif %}{% if include.type %} type="{{ include.type }}"{% endif %} class="btn{% if include.height %} btn-{{ include.height }}{% endif %}{% if color %} btn-{% if include.outline %}outline-{% elsif include.ghost %}ghost-{% endif %}{{ color }}{% endif %}{% if include.disabled %} disabled{% endif %}{% if include.square %} btn-square{% endif %}{% if include.loading %} btn-loading{% endif %}{% if include.pill %} btn-pill{% endif %}{% if include['size'] %} btn-{{ include['size'] }}{% endif %}{% if include.class %} {{ include.class }}{% endif %}{% if include.block %} w-100{% endif %}{% if include.link %} btn-link{% endif %}{% if include.icon-only %} btn-icon{% endif %}"{% if include.external %} target="_blank" rel="noreferrer"{% endif %}{% if include.modal-id %} data-toggle="modal" data-target="#modal-{{ include.modal-id }}"{% endif %}{% if include.icon-only %} aria-label="{{ include.text | default: "Button" }}"{% endif %}{% if include.dismiss %} data-dismiss="modal"{% endif %}> +<{{ e }}{% if e == 'a' %} href="{{ href }}"{% endif %}{% if include.type %} type="{{ include.type }}"{% endif %} class="btn{% if include.height %} btn-{{ include.height }}{% endif %}{% if color %} btn-{% if include.outline %}outline-{% elsif include.ghost %}ghost-{% endif %}{{ color }}{% endif %}{% if include.disabled %} disabled{% endif %}{% if include.square %} btn-square{% endif %}{% if include.loading %} btn-loading{% endif %}{% if include.pill %} btn-pill{% endif %}{% if include['size'] %} btn-{{ include['size'] }}{% endif %}{% if include.class %} {{ include.class }}{% endif %}{% if include.block %} w-100{% endif %}{% if include.link %} btn-link{% endif %}{% if include.icon-only %} btn-icon{% endif %}"{% if include.external %} target="_blank" rel="noreferrer"{% endif %}{% if include.modal-id %} data-bs-toggle="modal" data-target="#modal-{{ include.modal-id }}"{% endif %}{% if include.icon-only %} aria-label="{{ include.text | default: "Button" }}"{% endif %}{% if include.dismiss %} data-dismiss="modal"{% endif %}> {% if include.spinner %} {% include ui/spinner.html color=false size="sm" class=spinner-class element="span" %}{% endif %} {% if include.icon %}{% include ui/icon.html icon=include.icon use-svg=true color=include.icon-color %}{% endif %} diff --git a/src/pages/_includes/ui/card-dropdown.html b/src/pages/_includes/ui/card-dropdown.html index fa6bcbe3..ce134334 100644 --- a/src/pages/_includes/ui/card-dropdown.html +++ b/src/pages/_includes/ui/card-dropdown.html @@ -1,7 +1,7 @@ {% assign menu = include.menu | default: 'Import,Export,Download,Another action' | split: ',' %} {% assign icon = include.icon | default: 'dots-vertical' %}
    -
    diff --git a/src/pages/_includes/ui/form/input-group.html b/src/pages/_includes/ui/form/input-group.html index c860ba98..a048029a 100644 --- a/src/pages/_includes/ui/form/input-group.html +++ b/src/pages/_includes/ui/form/input-group.html @@ -31,7 +31,7 @@ {% assign icon = b[0] %} {% assign description = b[1] %} - {% include ui/icon.html icon=icon %} + {% include ui/icon.html icon=icon %} {% endfor %} {% endif %} diff --git a/src/pages/_includes/ui/form/textarea-autosize.html b/src/pages/_includes/ui/form/textarea-autosize.html index c25017a7..22f735b3 100644 --- a/src/pages/_includes/ui/form/textarea-autosize.html +++ b/src/pages/_includes/ui/form/textarea-autosize.html @@ -1 +1 @@ - + diff --git a/src/pages/_includes/ui/steps.html b/src/pages/_includes/ui/steps.html index a07be05e..844c856c 100644 --- a/src/pages/_includes/ui/steps.html +++ b/src/pages/_includes/ui/steps.html @@ -4,7 +4,7 @@ {% for i in (1..count) %} {% assign elem = 'a' %} {% if i > active %}{% assign elem = 'span' %}{% endif %} - <{{ elem }} href="#" class="step-item{% if i == active %} active{% endif %}"{% if include.show-tooltip %} data-toggle="tooltip" title="Step {{ i }} description"{% endif %}>{% if include.show-title %} + <{{ elem }} href="#" class="step-item{% if i == active %} active{% endif %}"{% if include.show-tooltip %} data-bs-toggle="tooltip" title="Step {{ i }} description"{% endif %}>{% if include.show-title %} Step {{ i }} {% endif %} {% endfor %} diff --git a/src/pages/_includes/ui/switch-icon.html b/src/pages/_includes/ui/switch-icon.html index 02c780c7..ab0f75b2 100644 --- a/src/pages/_includes/ui/switch-icon.html +++ b/src/pages/_includes/ui/switch-icon.html @@ -9,7 +9,7 @@ {% assign icon-b-class = include.icon-b-class %} {% endif %} - {% include ui/dropdown-menu.html right=true %} diff --git a/src/pages/_includes/ui/toast.html b/src/pages/_includes/ui/toast.html index 97d2f40f..06b3971a 100644 --- a/src/pages/_includes/ui/toast.html +++ b/src/pages/_includes/ui/toast.html @@ -1,6 +1,6 @@ {% assign person-id = include.person-id | default: 2 %} {% assign person = site.data.people[person-id] %} -