Skip to content

Commit 19cda9a

Browse files
markdumaymarkdumay
authored
Merge pull request #1556 from gethinode/develop
Develop
2 parents 60872ea + 9ee9ebc commit 19cda9a

File tree

5 files changed

+176
-73
lines changed

5 files changed

+176
-73
lines changed

‎assets/scss/components/_navbar.scss‎

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -174,10 +174,22 @@
174174
color: var(--bs-navbar-color);
175175
}
176176

177-
.nav-item > div, .nav-item > a {
177+
.navbar .nav-item {
178178
display: flex;
179179
align-items: center;
180-
height: 100%;
180+
}
181+
182+
.navbar-collapse .dropdown {
183+
display: inline;
184+
align-items: normal;
185+
}
186+
187+
.navbar-expanded .btn {
188+
font-size: 1em;
189+
}
190+
191+
.navbar-expanded .search-input {
192+
margin-bottom: 1rem;
181193
}
182194

183195
/* Remove border from toggler */

‎exampleSite/hugo_stats.json‎

Lines changed: 136 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -383,6 +383,7 @@
383383
"me-1",
384384
"me-3",
385385
"me-auto",
386+
"me-md-3",
386387
"mermaid",
387388
"middle-bar",
388389
"mode-item",
@@ -658,11 +659,21 @@
658659
"docs",
659660
"documentation",
660661
"dropdown-nav-0",
661-
"dropdown-panel-1cf9fa6c1b8db897289f1e58eca1ed2b",
662-
"dropdown-panel-2112fcf4fa7219518b7b70498969a79b",
663-
"dropdown-panel-2c61c8fd2a96d840748e5d5aa5e6ab20",
664-
"dropdown-panel-94a8f41d03ff238aa65acebc1b274df7",
665-
"dropdown-panel-dd79f20dce01073bc4b064a98deaff96",
662+
"dropdown-panel-01903ba17af95824def84bc35a6e3306",
663+
"dropdown-panel-05e5e9179a23b45d817c9b09fc485653",
664+
"dropdown-panel-09f43aa502c781608dd9f2b0cb98a906",
665+
"dropdown-panel-0c5fed3ccca7e8ab9efc12bf85a85305",
666+
"dropdown-panel-273c297242d64290bec92af244e3a961",
667+
"dropdown-panel-35371b9cfdf9b080c6520e1934d35220",
668+
"dropdown-panel-46e8c254518572ba99d235e25c7f3b0f",
669+
"dropdown-panel-834ebde9525f9a0ef2c057535e4cb999",
670+
"dropdown-panel-90aa3b6d152bd4d1935dab4e75816aa2",
671+
"dropdown-panel-9521a860a7e5a4705af6e032020e20ad",
672+
"dropdown-panel-b282e4a4197cfc522046f7a07249b76b",
673+
"dropdown-panel-ba2723c30ccb0a23594b530ac3b34278",
674+
"dropdown-panel-eb5038cdf97e98e540b83f69918e30db",
675+
"dropdown-panel-eb7776fb2d7c366115b0f577a8c045e5",
676+
"dropdown-panel-f9855139b07c94a96b537f05234ef8a0",
666677
"elements-type",
667678
"entity-relationship-diagram",
668679
"example",
@@ -680,11 +691,21 @@
680691
"fab-medium",
681692
"fab-whatsapp",
682693
"fab-x-twitter",
683-
"faq-40baa94f9dbf495433e3d6b5106aad41",
684-
"faq-40baa94f9dbf495433e3d6b5106aad41-heading-faq-40baa94f9dbf495433e3d6b5106aad41",
685-
"faq-40baa94f9dbf495433e3d6b5106aad41-item-0",
686-
"faq-40baa94f9dbf495433e3d6b5106aad41-item-1",
687-
"faq-40baa94f9dbf495433e3d6b5106aad41-item-2",
694+
"faq-8ef77215c152ca7f31aedf36f49b8e03",
695+
"faq-8ef77215c152ca7f31aedf36f49b8e03-heading-faq-8ef77215c152ca7f31aedf36f49b8e03",
696+
"faq-8ef77215c152ca7f31aedf36f49b8e03-item-0",
697+
"faq-8ef77215c152ca7f31aedf36f49b8e03-item-1",
698+
"faq-8ef77215c152ca7f31aedf36f49b8e03-item-2",
699+
"faq-bb38a13793cb37518c264c48ff8fef32",
700+
"faq-bb38a13793cb37518c264c48ff8fef32-heading-faq-bb38a13793cb37518c264c48ff8fef32",
701+
"faq-bb38a13793cb37518c264c48ff8fef32-item-0",
702+
"faq-bb38a13793cb37518c264c48ff8fef32-item-1",
703+
"faq-bb38a13793cb37518c264c48ff8fef32-item-2",
704+
"faq-e9d1a15ee6cb8a842073a46c06255ebd",
705+
"faq-e9d1a15ee6cb8a842073a46c06255ebd-heading-faq-e9d1a15ee6cb8a842073a46c06255ebd",
706+
"faq-e9d1a15ee6cb8a842073a46c06255ebd-item-0",
707+
"faq-e9d1a15ee6cb8a842073a46c06255ebd-item-1",
708+
"faq-e9d1a15ee6cb8a842073a46c06255ebd-item-2",
688709
"fas-1",
689710
"fas-2",
690711
"fas-3",
@@ -779,11 +800,21 @@
779800
"nav-0-btn-1",
780801
"nav-0-btn-2",
781802
"nav-nav-0",
782-
"nav-panel-1cf9fa6c1b8db897289f1e58eca1ed2b",
783-
"nav-panel-2112fcf4fa7219518b7b70498969a79b",
784-
"nav-panel-2c61c8fd2a96d840748e5d5aa5e6ab20",
785-
"nav-panel-94a8f41d03ff238aa65acebc1b274df7",
786-
"nav-panel-dd79f20dce01073bc4b064a98deaff96",
803+
"nav-panel-01903ba17af95824def84bc35a6e3306",
804+
"nav-panel-05e5e9179a23b45d817c9b09fc485653",
805+
"nav-panel-09f43aa502c781608dd9f2b0cb98a906",
806+
"nav-panel-0c5fed3ccca7e8ab9efc12bf85a85305",
807+
"nav-panel-273c297242d64290bec92af244e3a961",
808+
"nav-panel-35371b9cfdf9b080c6520e1934d35220",
809+
"nav-panel-46e8c254518572ba99d235e25c7f3b0f",
810+
"nav-panel-834ebde9525f9a0ef2c057535e4cb999",
811+
"nav-panel-90aa3b6d152bd4d1935dab4e75816aa2",
812+
"nav-panel-9521a860a7e5a4705af6e032020e20ad",
813+
"nav-panel-b282e4a4197cfc522046f7a07249b76b",
814+
"nav-panel-ba2723c30ccb0a23594b530ac3b34278",
815+
"nav-panel-eb5038cdf97e98e540b83f69918e30db",
816+
"nav-panel-eb7776fb2d7c366115b0f577a8c045e5",
817+
"nav-panel-f9855139b07c94a96b537f05234ef8a0",
787818
"navbar",
788819
"navbar-0-collapse",
789820
"navbar-mode",
@@ -792,36 +823,96 @@
792823
"navigation",
793824
"notification",
794825
"overview",
795-
"panel-1cf9fa6c1b8db897289f1e58eca1ed2b-0",
796-
"panel-1cf9fa6c1b8db897289f1e58eca1ed2b-1",
797-
"panel-1cf9fa6c1b8db897289f1e58eca1ed2b-2",
798-
"panel-1cf9fa6c1b8db897289f1e58eca1ed2b-btn-0",
799-
"panel-1cf9fa6c1b8db897289f1e58eca1ed2b-btn-1",
800-
"panel-1cf9fa6c1b8db897289f1e58eca1ed2b-btn-2",
801-
"panel-2112fcf4fa7219518b7b70498969a79b-0",
802-
"panel-2112fcf4fa7219518b7b70498969a79b-1",
803-
"panel-2112fcf4fa7219518b7b70498969a79b-2",
804-
"panel-2112fcf4fa7219518b7b70498969a79b-btn-0",
805-
"panel-2112fcf4fa7219518b7b70498969a79b-btn-1",
806-
"panel-2112fcf4fa7219518b7b70498969a79b-btn-2",
807-
"panel-2c61c8fd2a96d840748e5d5aa5e6ab20-0",
808-
"panel-2c61c8fd2a96d840748e5d5aa5e6ab20-1",
809-
"panel-2c61c8fd2a96d840748e5d5aa5e6ab20-2",
810-
"panel-2c61c8fd2a96d840748e5d5aa5e6ab20-btn-0",
811-
"panel-2c61c8fd2a96d840748e5d5aa5e6ab20-btn-1",
812-
"panel-2c61c8fd2a96d840748e5d5aa5e6ab20-btn-2",
813-
"panel-94a8f41d03ff238aa65acebc1b274df7-0",
814-
"panel-94a8f41d03ff238aa65acebc1b274df7-1",
815-
"panel-94a8f41d03ff238aa65acebc1b274df7-2",
816-
"panel-94a8f41d03ff238aa65acebc1b274df7-btn-0",
817-
"panel-94a8f41d03ff238aa65acebc1b274df7-btn-1",
818-
"panel-94a8f41d03ff238aa65acebc1b274df7-btn-2",
819-
"panel-dd79f20dce01073bc4b064a98deaff96-0",
820-
"panel-dd79f20dce01073bc4b064a98deaff96-1",
821-
"panel-dd79f20dce01073bc4b064a98deaff96-2",
822-
"panel-dd79f20dce01073bc4b064a98deaff96-btn-0",
823-
"panel-dd79f20dce01073bc4b064a98deaff96-btn-1",
824-
"panel-dd79f20dce01073bc4b064a98deaff96-btn-2",
826+
"panel-01903ba17af95824def84bc35a6e3306-0",
827+
"panel-01903ba17af95824def84bc35a6e3306-1",
828+
"panel-01903ba17af95824def84bc35a6e3306-2",
829+
"panel-01903ba17af95824def84bc35a6e3306-btn-0",
830+
"panel-01903ba17af95824def84bc35a6e3306-btn-1",
831+
"panel-01903ba17af95824def84bc35a6e3306-btn-2",
832+
"panel-05e5e9179a23b45d817c9b09fc485653-0",
833+
"panel-05e5e9179a23b45d817c9b09fc485653-1",
834+
"panel-05e5e9179a23b45d817c9b09fc485653-2",
835+
"panel-05e5e9179a23b45d817c9b09fc485653-btn-0",
836+
"panel-05e5e9179a23b45d817c9b09fc485653-btn-1",
837+
"panel-05e5e9179a23b45d817c9b09fc485653-btn-2",
838+
"panel-09f43aa502c781608dd9f2b0cb98a906-0",
839+
"panel-09f43aa502c781608dd9f2b0cb98a906-1",
840+
"panel-09f43aa502c781608dd9f2b0cb98a906-2",
841+
"panel-09f43aa502c781608dd9f2b0cb98a906-btn-0",
842+
"panel-09f43aa502c781608dd9f2b0cb98a906-btn-1",
843+
"panel-09f43aa502c781608dd9f2b0cb98a906-btn-2",
844+
"panel-0c5fed3ccca7e8ab9efc12bf85a85305-0",
845+
"panel-0c5fed3ccca7e8ab9efc12bf85a85305-1",
846+
"panel-0c5fed3ccca7e8ab9efc12bf85a85305-2",
847+
"panel-0c5fed3ccca7e8ab9efc12bf85a85305-btn-0",
848+
"panel-0c5fed3ccca7e8ab9efc12bf85a85305-btn-1",
849+
"panel-0c5fed3ccca7e8ab9efc12bf85a85305-btn-2",
850+
"panel-273c297242d64290bec92af244e3a961-0",
851+
"panel-273c297242d64290bec92af244e3a961-1",
852+
"panel-273c297242d64290bec92af244e3a961-2",
853+
"panel-273c297242d64290bec92af244e3a961-btn-0",
854+
"panel-273c297242d64290bec92af244e3a961-btn-1",
855+
"panel-273c297242d64290bec92af244e3a961-btn-2",
856+
"panel-35371b9cfdf9b080c6520e1934d35220-0",
857+
"panel-35371b9cfdf9b080c6520e1934d35220-1",
858+
"panel-35371b9cfdf9b080c6520e1934d35220-2",
859+
"panel-35371b9cfdf9b080c6520e1934d35220-btn-0",
860+
"panel-35371b9cfdf9b080c6520e1934d35220-btn-1",
861+
"panel-35371b9cfdf9b080c6520e1934d35220-btn-2",
862+
"panel-46e8c254518572ba99d235e25c7f3b0f-0",
863+
"panel-46e8c254518572ba99d235e25c7f3b0f-1",
864+
"panel-46e8c254518572ba99d235e25c7f3b0f-2",
865+
"panel-46e8c254518572ba99d235e25c7f3b0f-btn-0",
866+
"panel-46e8c254518572ba99d235e25c7f3b0f-btn-1",
867+
"panel-46e8c254518572ba99d235e25c7f3b0f-btn-2",
868+
"panel-834ebde9525f9a0ef2c057535e4cb999-0",
869+
"panel-834ebde9525f9a0ef2c057535e4cb999-1",
870+
"panel-834ebde9525f9a0ef2c057535e4cb999-2",
871+
"panel-834ebde9525f9a0ef2c057535e4cb999-btn-0",
872+
"panel-834ebde9525f9a0ef2c057535e4cb999-btn-1",
873+
"panel-834ebde9525f9a0ef2c057535e4cb999-btn-2",
874+
"panel-90aa3b6d152bd4d1935dab4e75816aa2-0",
875+
"panel-90aa3b6d152bd4d1935dab4e75816aa2-1",
876+
"panel-90aa3b6d152bd4d1935dab4e75816aa2-2",
877+
"panel-90aa3b6d152bd4d1935dab4e75816aa2-btn-0",
878+
"panel-90aa3b6d152bd4d1935dab4e75816aa2-btn-1",
879+
"panel-90aa3b6d152bd4d1935dab4e75816aa2-btn-2",
880+
"panel-9521a860a7e5a4705af6e032020e20ad-0",
881+
"panel-9521a860a7e5a4705af6e032020e20ad-1",
882+
"panel-9521a860a7e5a4705af6e032020e20ad-2",
883+
"panel-9521a860a7e5a4705af6e032020e20ad-btn-0",
884+
"panel-9521a860a7e5a4705af6e032020e20ad-btn-1",
885+
"panel-9521a860a7e5a4705af6e032020e20ad-btn-2",
886+
"panel-b282e4a4197cfc522046f7a07249b76b-0",
887+
"panel-b282e4a4197cfc522046f7a07249b76b-1",
888+
"panel-b282e4a4197cfc522046f7a07249b76b-2",
889+
"panel-b282e4a4197cfc522046f7a07249b76b-btn-0",
890+
"panel-b282e4a4197cfc522046f7a07249b76b-btn-1",
891+
"panel-b282e4a4197cfc522046f7a07249b76b-btn-2",
892+
"panel-ba2723c30ccb0a23594b530ac3b34278-0",
893+
"panel-ba2723c30ccb0a23594b530ac3b34278-1",
894+
"panel-ba2723c30ccb0a23594b530ac3b34278-2",
895+
"panel-ba2723c30ccb0a23594b530ac3b34278-btn-0",
896+
"panel-ba2723c30ccb0a23594b530ac3b34278-btn-1",
897+
"panel-ba2723c30ccb0a23594b530ac3b34278-btn-2",
898+
"panel-eb5038cdf97e98e540b83f69918e30db-0",
899+
"panel-eb5038cdf97e98e540b83f69918e30db-1",
900+
"panel-eb5038cdf97e98e540b83f69918e30db-2",
901+
"panel-eb5038cdf97e98e540b83f69918e30db-btn-0",
902+
"panel-eb5038cdf97e98e540b83f69918e30db-btn-1",
903+
"panel-eb5038cdf97e98e540b83f69918e30db-btn-2",
904+
"panel-eb7776fb2d7c366115b0f577a8c045e5-0",
905+
"panel-eb7776fb2d7c366115b0f577a8c045e5-1",
906+
"panel-eb7776fb2d7c366115b0f577a8c045e5-2",
907+
"panel-eb7776fb2d7c366115b0f577a8c045e5-btn-0",
908+
"panel-eb7776fb2d7c366115b0f577a8c045e5-btn-1",
909+
"panel-eb7776fb2d7c366115b0f577a8c045e5-btn-2",
910+
"panel-f9855139b07c94a96b537f05234ef8a0-0",
911+
"panel-f9855139b07c94a96b537f05234ef8a0-1",
912+
"panel-f9855139b07c94a96b537f05234ef8a0-2",
913+
"panel-f9855139b07c94a96b537f05234ef8a0-btn-0",
914+
"panel-f9855139b07c94a96b537f05234ef8a0-btn-1",
915+
"panel-f9855139b07c94a96b537f05234ef8a0-btn-2",
825916
"persona",
826917
"pie-chart",
827918
"pills",

‎layouts/_partials/assets/featured-illustration.html‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -7,45 +7,45 @@
77
{{ $error := false }}
88

99
{{/* Initialize arguments */}}
10-
{{ $args := partial "utilities/InitArgs.html" (dict "structure" "featured-illustration" "args" . "group" "partial") }}
11-
{{ if or $args.err $args.warnmsg }}
12-
{{ partial (cond $args.err "utilities/LogErr.html" "utilities/LogWarn.html") (dict
10+
{{- $args := partial "utilities/InitArgs.html" (dict "structure" "featured-illustration" "args" . "group" "partial") -}}
11+
{{- if or $args.err $args.warnmsg -}}
12+
{{- partial (cond $args.err "utilities/LogErr.html" "utilities/LogWarn.html") (dict
1313
"partial" "assets/featured-illustration.html"
1414
"warnid" "warn-invalid-arguments"
1515
"msg" "Invalid arguments"
1616
"details" ($args.errmsg | append $args.warnmsg)
1717
"file" page.File
18-
)}}
19-
{{ $error = $args.err }}
20-
{{ end }}
18+
) -}}
19+
{{- $error = $args.err -}}
20+
{{- end -}}
2121

2222
{{/* Initialize local arguments */}}
2323

24-
{{ $icon := partial "utilities/GetTargetPath.html" (dict "path" $args.icon "page" $args.page) }}
25-
{{ $image := partial "utilities/GetTargetPath.html" (dict "path" $args.image "page" $args.page) }}
24+
{{- $icon := partial "utilities/GetTargetPath.html" (dict "path" $args.icon "page" $args.page) -}}
25+
{{- $image := partial "utilities/GetTargetPath.html" (dict "path" $args.image "page" $args.page) -}}
2626
{{- $wrapper := $args.wrapper -}}
27-
{{ if $image }}{{ $wrapper = print "img-wrap " (or $wrapper "mx-auto") }}{{ end -}}
27+
{{- if $image }}{{ $wrapper = printf "img-wrap %s" (or $wrapper "mx-auto") }}{{ end -}}
2828
{{- $class := $args.class -}}
2929

30-
{{ if $icon }}
31-
{{ if eq (lower (path.Ext $icon)) ".json" }}
32-
{{ if site.Params.env_bookshop_live }}
30+
{{- if $icon -}}
31+
{{- if eq (lower (path.Ext $icon)) ".json" -}}
32+
{{- if site.Params.env_bookshop_live }}
3333
<i>Animation preview not supported</i>
34-
{{ else }}
35-
{{ partial "assets/animation.html" (dict
34+
{{- else }}
35+
{{- partial "assets/animation.html" (dict
3636
"data" $icon
3737
"mode" $args.mode
3838
"loop" false
3939
"hover" true
4040
"class" "col-6 mx-auto text-center"
41-
) }}
42-
{{ end }}
43-
{{ else }}
44-
{{ partial "assets/icon.html" (dict "icon" $icon "wrapper" $wrapper) }}
45-
{{ end }}
46-
{{ else if $image }}
47-
{{ if not (hasSuffix $image "svg") }}{{ $class = printf "%s rounded" $class }}{{ end }}
48-
{{ partial "assets/live-image.html" (dict
41+
) -}}
42+
{{- end -}}
43+
{{- else }}
44+
{{ partial "assets/icon.html" (dict "icon" $icon "wrapper" $wrapper) -}}
45+
{{- end -}}
46+
{{- else if $image -}}
47+
{{- if not (hasSuffix $image "svg") }}{{ $class = printf "%s rounded" $class }}{{ end -}}
48+
{{- partial "assets/live-image.html" (dict
4949
"src" $image
5050
"anchor" $args.anchor
5151
"ratio" $args.ratio
@@ -55,5 +55,5 @@
5555
"sizes" $args.sizes
5656
"priority" "high"
5757
"mode" $args.mode
58-
) }}
59-
{{ end }}
58+
) -}}
59+
{{- end -}}

‎layouts/_partials/assets/helpers/navbar-render-menu.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
{{ if $menu.Params.spacing }}
1212
<li class="nav-item flex-grow-1"></li>
1313
{{ else }}
14-
<li class="nav-item {{ if .HasChildren }} dropdown{{ if $horizontal }} dropdown-horizontal-{{ $breakpoint }}{{ end }}{{ end }}">
14+
<li class="nav-item {{ if .HasChildren }} dropdown me-auto{{ if $horizontal }} dropdown-horizontal-{{ $breakpoint }}{{ end }}{{ end }}">
1515
{{- partial "assets/helpers/navbar-item.html" (dict "menu" $menu "page" $page) -}}
1616
{{- if .HasChildren -}}
1717
<ul class="dropdown-menu{{ if $control }} dropdown-menu-end{{ end }}">

‎layouts/_partials/assets/navbar.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@
145145
<div class="navbar-collapse collapse" id="{{ $id }}-collapse">
146146
{{/* Insert search input */}}
147147
{{- if and $search.enabled (not $search.modal) }}
148-
{{ partial "assets/search-input.html" (dict "class" (printf "mt-4 mt-%s-0" $args.breakpoint)) }}
148+
{{ partial "assets/search-input.html" (dict "class" (printf "mt-4 mt-%s-0 me-%s-3" $args.breakpoint $args.breakpoint)) }}
149149
{{ end -}}
150150

151151
<ul class="navbar-nav navbar-nav-scroll {{ if $flex }}d-flex w-100{{ else }}ms-auto{{ end }}">

0 commit comments

Comments
 (0)