Skip to content

Commit 7940bc6

Browse files
markdumaymarkdumay
authored
Merge pull request #1610 from gethinode/develop
Develop
2 parents b90bbbd + 21e85db commit 7940bc6

File tree

5 files changed

+120
-47
lines changed

5 files changed

+120
-47
lines changed

‎assets/js/navbar.js‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ const togglers = document.querySelectorAll('.main-nav-toggler')
44
const modeSelectors = document.querySelectorAll('.switch-mode-collapsed')
55
const colorsBG = ['body', 'secondary', 'tertiary']
66

7+
let scrollPosition = 0
8+
79
function sleep(ms) {
810
return new Promise(resolve => setTimeout(resolve, ms))
911
}
@@ -175,6 +177,20 @@ if (navbar !== null && togglers !== null) {
175177
document.addEventListener('resize', () => fixed && updateNavbar())
176178
document.addEventListener('scroll', () => fixed && updateNavbar())
177179

180+
// hook up collapse events
181+
document.querySelectorAll('.navbar-collapse').forEach((collapse) => {
182+
collapse.addEventListener('show.bs.collapse', function () {
183+
scrollPosition = window.pageYOffset
184+
document.body.style.top = `-${scrollPosition}px`
185+
document.body.classList.add('navbar-open')
186+
})
187+
collapse.addEventListener('hide.bs.collapse', function () {
188+
document.body.classList.remove('navbar-open')
189+
document.body.style.top = ''
190+
window.scrollTo({ top: scrollPosition, behavior: 'instant' })
191+
})
192+
})
193+
178194
// observe state changes to the site's color mode
179195
const html = document.querySelector('html')
180196
const config = {

‎assets/scss/components/_navbar.scss‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -435,3 +435,9 @@
435435
ul.inline-menu {
436436
padding: 0;
437437
}
438+
439+
body.navbar-open {
440+
overflow: hidden;
441+
position: fixed;
442+
width: 100%;
443+
}

‎exampleSite/hugo_stats.json‎

Lines changed: 96 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -248,6 +248,9 @@
248248
"fa-activity",
249249
"fa-address-card",
250250
"fa-angle-left",
251+
"fa-angle-right",
252+
"fa-angles-left",
253+
"fa-angles-right",
251254
"fa-arrow-left",
252255
"fa-arrow-right",
253256
"fa-bootstrap",
@@ -678,11 +681,16 @@
678681
"docs",
679682
"documentation",
680683
"dropdown-nav-0",
681-
"dropdown-panel-07d1354ac1f376fa71ba3c17bda5d1e8",
682-
"dropdown-panel-9fbb4d11f9789e8d1ac8101f27e50d43",
683-
"dropdown-panel-b612d68b0712cd7dad9655013798aaeb",
684-
"dropdown-panel-be9ac158248a563331ee993b38022af7",
685-
"dropdown-panel-deed5194e569ce126edf85b9ece8aec6",
684+
"dropdown-panel-05f2e5ae7cf8c0ab8a49ba311bdc4d7e",
685+
"dropdown-panel-256968d78244b40725f5d484ea340a5f",
686+
"dropdown-panel-29ba03d101604c5caa618293938833b1",
687+
"dropdown-panel-30c508a91fbd512d0bee6f976efc028c",
688+
"dropdown-panel-47c670e7ebc8dd6e57f5d70dde479a8b",
689+
"dropdown-panel-4c945acd0c9326daa6f433a64262c7a0",
690+
"dropdown-panel-552e42166b1b143d516aeccc1fbc7d32",
691+
"dropdown-panel-bf5b105df93a1545b2fc424e3ab1c654",
692+
"dropdown-panel-e5aba6d799885a8fd4208fade274e3a7",
693+
"dropdown-panel-fd6d8a3429e95196931cd8c08072abf3",
686694
"eerste-artikel",
687695
"elements-type",
688696
"entity-relationship-diagram",
@@ -703,16 +711,24 @@
703711
"fab-whatsapp",
704712
"fab-x-twitter",
705713
"faq",
706-
"faq-3ab3d1bfbd7996fb6dc7159e57eff8af",
707-
"faq-3ab3d1bfbd7996fb6dc7159e57eff8af-heading-faq-3ab3d1bfbd7996fb6dc7159e57eff8af",
708-
"faq-3ab3d1bfbd7996fb6dc7159e57eff8af-item-0",
709-
"faq-3ab3d1bfbd7996fb6dc7159e57eff8af-item-1",
710-
"faq-3ab3d1bfbd7996fb6dc7159e57eff8af-item-2",
714+
"faq-726ff0b8b5ec9328cfef51994d523ad1",
715+
"faq-726ff0b8b5ec9328cfef51994d523ad1-heading-faq-726ff0b8b5ec9328cfef51994d523ad1",
716+
"faq-726ff0b8b5ec9328cfef51994d523ad1-item-0",
717+
"faq-726ff0b8b5ec9328cfef51994d523ad1-item-1",
718+
"faq-726ff0b8b5ec9328cfef51994d523ad1-item-2",
719+
"faq-c610e94909d8dd90e16cbcbc4cc3fe84",
720+
"faq-c610e94909d8dd90e16cbcbc4cc3fe84-heading-faq-c610e94909d8dd90e16cbcbc4cc3fe84",
721+
"faq-c610e94909d8dd90e16cbcbc4cc3fe84-item-0",
722+
"faq-c610e94909d8dd90e16cbcbc4cc3fe84-item-1",
723+
"faq-c610e94909d8dd90e16cbcbc4cc3fe84-item-2",
711724
"fas-1",
712725
"fas-2",
713726
"fas-3",
714727
"fas-address-card",
715728
"fas-angle-left",
729+
"fas-angle-right",
730+
"fas-angles-left",
731+
"fas-angles-right",
716732
"fas-arrow-left",
717733
"fas-arrow-right",
718734
"fas-chevron-right",
@@ -803,11 +819,16 @@
803819
"nav-0-btn-1",
804820
"nav-0-btn-2",
805821
"nav-nav-0",
806-
"nav-panel-07d1354ac1f376fa71ba3c17bda5d1e8",
807-
"nav-panel-9fbb4d11f9789e8d1ac8101f27e50d43",
808-
"nav-panel-b612d68b0712cd7dad9655013798aaeb",
809-
"nav-panel-be9ac158248a563331ee993b38022af7",
810-
"nav-panel-deed5194e569ce126edf85b9ece8aec6",
822+
"nav-panel-05f2e5ae7cf8c0ab8a49ba311bdc4d7e",
823+
"nav-panel-256968d78244b40725f5d484ea340a5f",
824+
"nav-panel-29ba03d101604c5caa618293938833b1",
825+
"nav-panel-30c508a91fbd512d0bee6f976efc028c",
826+
"nav-panel-47c670e7ebc8dd6e57f5d70dde479a8b",
827+
"nav-panel-4c945acd0c9326daa6f433a64262c7a0",
828+
"nav-panel-552e42166b1b143d516aeccc1fbc7d32",
829+
"nav-panel-bf5b105df93a1545b2fc424e3ab1c654",
830+
"nav-panel-e5aba6d799885a8fd4208fade274e3a7",
831+
"nav-panel-fd6d8a3429e95196931cd8c08072abf3",
811832
"navbar",
812833
"navbar-0-collapse",
813834
"navbar-mode",
@@ -817,36 +838,66 @@
817838
"notification",
818839
"over-mij",
819840
"overview",
820-
"panel-07d1354ac1f376fa71ba3c17bda5d1e8-0",
821-
"panel-07d1354ac1f376fa71ba3c17bda5d1e8-1",
822-
"panel-07d1354ac1f376fa71ba3c17bda5d1e8-2",
823-
"panel-07d1354ac1f376fa71ba3c17bda5d1e8-btn-0",
824-
"panel-07d1354ac1f376fa71ba3c17bda5d1e8-btn-1",
825-
"panel-07d1354ac1f376fa71ba3c17bda5d1e8-btn-2",
826-
"panel-9fbb4d11f9789e8d1ac8101f27e50d43-0",
827-
"panel-9fbb4d11f9789e8d1ac8101f27e50d43-1",
828-
"panel-9fbb4d11f9789e8d1ac8101f27e50d43-2",
829-
"panel-9fbb4d11f9789e8d1ac8101f27e50d43-btn-0",
830-
"panel-9fbb4d11f9789e8d1ac8101f27e50d43-btn-1",
831-
"panel-9fbb4d11f9789e8d1ac8101f27e50d43-btn-2",
832-
"panel-b612d68b0712cd7dad9655013798aaeb-0",
833-
"panel-b612d68b0712cd7dad9655013798aaeb-1",
834-
"panel-b612d68b0712cd7dad9655013798aaeb-2",
835-
"panel-b612d68b0712cd7dad9655013798aaeb-btn-0",
836-
"panel-b612d68b0712cd7dad9655013798aaeb-btn-1",
837-
"panel-b612d68b0712cd7dad9655013798aaeb-btn-2",
838-
"panel-be9ac158248a563331ee993b38022af7-0",
839-
"panel-be9ac158248a563331ee993b38022af7-1",
840-
"panel-be9ac158248a563331ee993b38022af7-2",
841-
"panel-be9ac158248a563331ee993b38022af7-btn-0",
842-
"panel-be9ac158248a563331ee993b38022af7-btn-1",
843-
"panel-be9ac158248a563331ee993b38022af7-btn-2",
844-
"panel-deed5194e569ce126edf85b9ece8aec6-0",
845-
"panel-deed5194e569ce126edf85b9ece8aec6-1",
846-
"panel-deed5194e569ce126edf85b9ece8aec6-2",
847-
"panel-deed5194e569ce126edf85b9ece8aec6-btn-0",
848-
"panel-deed5194e569ce126edf85b9ece8aec6-btn-1",
849-
"panel-deed5194e569ce126edf85b9ece8aec6-btn-2",
841+
"panel-05f2e5ae7cf8c0ab8a49ba311bdc4d7e-0",
842+
"panel-05f2e5ae7cf8c0ab8a49ba311bdc4d7e-1",
843+
"panel-05f2e5ae7cf8c0ab8a49ba311bdc4d7e-2",
844+
"panel-05f2e5ae7cf8c0ab8a49ba311bdc4d7e-btn-0",
845+
"panel-05f2e5ae7cf8c0ab8a49ba311bdc4d7e-btn-1",
846+
"panel-05f2e5ae7cf8c0ab8a49ba311bdc4d7e-btn-2",
847+
"panel-256968d78244b40725f5d484ea340a5f-0",
848+
"panel-256968d78244b40725f5d484ea340a5f-1",
849+
"panel-256968d78244b40725f5d484ea340a5f-2",
850+
"panel-256968d78244b40725f5d484ea340a5f-btn-0",
851+
"panel-256968d78244b40725f5d484ea340a5f-btn-1",
852+
"panel-256968d78244b40725f5d484ea340a5f-btn-2",
853+
"panel-29ba03d101604c5caa618293938833b1-0",
854+
"panel-29ba03d101604c5caa618293938833b1-1",
855+
"panel-29ba03d101604c5caa618293938833b1-2",
856+
"panel-29ba03d101604c5caa618293938833b1-btn-0",
857+
"panel-29ba03d101604c5caa618293938833b1-btn-1",
858+
"panel-29ba03d101604c5caa618293938833b1-btn-2",
859+
"panel-30c508a91fbd512d0bee6f976efc028c-0",
860+
"panel-30c508a91fbd512d0bee6f976efc028c-1",
861+
"panel-30c508a91fbd512d0bee6f976efc028c-2",
862+
"panel-30c508a91fbd512d0bee6f976efc028c-btn-0",
863+
"panel-30c508a91fbd512d0bee6f976efc028c-btn-1",
864+
"panel-30c508a91fbd512d0bee6f976efc028c-btn-2",
865+
"panel-47c670e7ebc8dd6e57f5d70dde479a8b-0",
866+
"panel-47c670e7ebc8dd6e57f5d70dde479a8b-1",
867+
"panel-47c670e7ebc8dd6e57f5d70dde479a8b-2",
868+
"panel-47c670e7ebc8dd6e57f5d70dde479a8b-btn-0",
869+
"panel-47c670e7ebc8dd6e57f5d70dde479a8b-btn-1",
870+
"panel-47c670e7ebc8dd6e57f5d70dde479a8b-btn-2",
871+
"panel-4c945acd0c9326daa6f433a64262c7a0-0",
872+
"panel-4c945acd0c9326daa6f433a64262c7a0-1",
873+
"panel-4c945acd0c9326daa6f433a64262c7a0-2",
874+
"panel-4c945acd0c9326daa6f433a64262c7a0-btn-0",
875+
"panel-4c945acd0c9326daa6f433a64262c7a0-btn-1",
876+
"panel-4c945acd0c9326daa6f433a64262c7a0-btn-2",
877+
"panel-552e42166b1b143d516aeccc1fbc7d32-0",
878+
"panel-552e42166b1b143d516aeccc1fbc7d32-1",
879+
"panel-552e42166b1b143d516aeccc1fbc7d32-2",
880+
"panel-552e42166b1b143d516aeccc1fbc7d32-btn-0",
881+
"panel-552e42166b1b143d516aeccc1fbc7d32-btn-1",
882+
"panel-552e42166b1b143d516aeccc1fbc7d32-btn-2",
883+
"panel-bf5b105df93a1545b2fc424e3ab1c654-0",
884+
"panel-bf5b105df93a1545b2fc424e3ab1c654-1",
885+
"panel-bf5b105df93a1545b2fc424e3ab1c654-2",
886+
"panel-bf5b105df93a1545b2fc424e3ab1c654-btn-0",
887+
"panel-bf5b105df93a1545b2fc424e3ab1c654-btn-1",
888+
"panel-bf5b105df93a1545b2fc424e3ab1c654-btn-2",
889+
"panel-e5aba6d799885a8fd4208fade274e3a7-0",
890+
"panel-e5aba6d799885a8fd4208fade274e3a7-1",
891+
"panel-e5aba6d799885a8fd4208fade274e3a7-2",
892+
"panel-e5aba6d799885a8fd4208fade274e3a7-btn-0",
893+
"panel-e5aba6d799885a8fd4208fade274e3a7-btn-1",
894+
"panel-e5aba6d799885a8fd4208fade274e3a7-btn-2",
895+
"panel-fd6d8a3429e95196931cd8c08072abf3-0",
896+
"panel-fd6d8a3429e95196931cd8c08072abf3-1",
897+
"panel-fd6d8a3429e95196931cd8c08072abf3-2",
898+
"panel-fd6d8a3429e95196931cd8c08072abf3-btn-0",
899+
"panel-fd6d8a3429e95196931cd8c08072abf3-btn-1",
900+
"panel-fd6d8a3429e95196931cd8c08072abf3-btn-2",
850901
"panels",
851902
"persona",
852903
"pie-chart",

‎layouts/_partials/assets/navbar.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@
135135
<div class="d-flex align-items-center">
136136
{{- if $sidebar -}}
137137
<button class="navbar-toggler collapsed p-0 mx-auto fw-30" type="button" data-bs-toggle="offcanvas"
138-
data-bs-target="#offcanvass-sidebar" aria-controls="offcanvass-sidebar" aria-label="{{ T "toggleSidebar" }}">
138+
data-bs-target="#offcanvas-sidebar" aria-controls="offcanvas-sidebar" aria-label="{{ T "toggleSidebar" }}">
139139
{{- partial "assets/icon.html" (dict "icon" "fas ellipsis fa-fw" "spacing" false) -}}
140140
</button>
141141
{{- else if eq $align "center" -}}

‎layouts/single.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
{{- $toc := partial "page/panel-toc" . -}}
66

77
{{ with $sidebar }}
8-
<div class="offcanvas offcanvas-start" tabindex="-1" id="offcanvass-sidebar" aria-labelledby="offcanvas-label">
8+
<div class="offcanvas offcanvas-start" tabindex="-1" id="offcanvas-sidebar" aria-labelledby="offcanvas-label">
99
<div class="offcanvas-header">
1010
<h5 class="offcanvas-title" id="offcanvas-label">{{ strings.FirstUpper $.Section }}</h5>
1111
<button type="button" class="btn-close" data-bs-dismiss="offcanvas" aria-label="{{ T "close" }}"></button>

0 commit comments

Comments
 (0)