From 781c8aed9cb2c5958f2b9ebd74b2af2eea972b12 Mon Sep 17 00:00:00 2001 From: gfakbar20 Date: Sat, 3 May 2025 19:08:15 +0700 Subject: [PATCH 1/2] fix overlapping menu item on the nav bar --- site/layouts/partials/navbar.html | 108 +++++++++++++++--------------- 1 file changed, 54 insertions(+), 54 deletions(-) diff --git a/site/layouts/partials/navbar.html b/site/layouts/partials/navbar.html index b235c33630..ae8efb83cd 100644 --- a/site/layouts/partials/navbar.html +++ b/site/layouts/partials/navbar.html @@ -39,60 +39,60 @@ {{ $p := . -}} {{ $s := .Site -}} {{ range .Site.Menus.main -}} - {{ if .HasChildren }} - -
- - -
- {{ else -}} - - {{ $topHidden := false }} - {{ if .Page }} - {{ $topHidden = .Page.Params.top_hidden | default false }} - {{ else }} - {{ $topHidden = .Params.top_hidden | default false }} - {{ end }} - {{ if not $topHidden }} -
  • - {{ $active := or ($p.IsMenuCurrent "main" .) ($p.HasMenuCurrent "main" .) -}} - {{ $href := "" -}} - {{ with .Page -}} - {{ $active = or $active ( $.IsDescendant .) -}} - {{ $href = .RelPermalink -}} - {{ else -}} - {{ $href = .URL | relLangURL -}} - {{ end -}} - {{ $isExternal := ne $baseURL.Host (urls.Parse .URL).Host -}} - - {{- .Pre -}} - {{ .Name }} - {{- .Post -}} - -
    • - {{ end -}} - {{ end -}} +
  • + {{ if .HasChildren }} + +
    + +
      + {{ $children := .Children.ByWeight -}} + {{ if eq .Identifier "releases" -}} + {{ with (partial "releasePages.html" (dict "site" $s)).active -}} + {{ range . -}} + {{ .Params.LinkTitle | default .Params.Title }} + {{- end -}} + {{ else -}} + {{ $children = where .Children.ByWeight "Identifier" "ne" "all-releases-page" -}} + {{ end -}} + {{ end -}} + {{ range $children -}} + {{ .Name }} + {{- end -}} +
    +
    + {{ else -}} + + {{ $topHidden := false }} + {{ if .Page }} + {{ $topHidden = .Page.Params.top_hidden | default false }} + {{ else }} + {{ $topHidden = .Params.top_hidden | default false }} + {{ end }} + {{ if not $topHidden }} + {{ $active := or ($p.IsMenuCurrent "main" .) ($p.HasMenuCurrent "main" .) -}} + {{ $href := "" -}} + {{ with .Page -}} + {{ $active = or $active ( $.IsDescendant .) -}} + {{ $href = .RelPermalink -}} + {{ else -}} + {{ $href = .URL | relLangURL -}} + {{ end -}} + {{ $isExternal := ne $baseURL.Host (urls.Parse .URL).Host -}} + + {{- .Pre -}} + {{ .Name }} + {{- .Post -}} + + {{ end -}} + {{ end -}} +
    • {{ end -}} {{ if .Site.Params.versions -}} From 271b2f19ec572178e34cfb68e5b26810dd375416 Mon Sep 17 00:00:00 2001 From: gfakbar20 Date: Sun, 4 May 2025 14:48:49 +0700 Subject: [PATCH 2/2] prevent dropdowns expanding inside the navbar --- site/layouts/partials/navbar.html | 38 +++++++++++++++---------------- 1 file changed, 18 insertions(+), 20 deletions(-) diff --git a/site/layouts/partials/navbar.html b/site/layouts/partials/navbar.html index ae8efb83cd..792b421e38 100644 --- a/site/layouts/partials/navbar.html +++ b/site/layouts/partials/navbar.html @@ -42,27 +42,25 @@
  • {{ if .HasChildren }} -
    - -
      - {{ $children := .Children.ByWeight -}} - {{ if eq .Identifier "releases" -}} - {{ with (partial "releasePages.html" (dict "site" $s)).active -}} - {{ range . -}} - {{ .Params.LinkTitle | default .Params.Title }} - {{- end -}} - {{ else -}} - {{ $children = where .Children.ByWeight "Identifier" "ne" "all-releases-page" -}} - {{ end -}} + +
        + {{ $children := .Children.ByWeight -}} + {{ if eq .Identifier "releases" -}} + {{ with (partial "releasePages.html" (dict "site" $s)).active -}} + {{ range . -}} + {{ .Params.LinkTitle | default .Params.Title }} + {{- end -}} + {{ else -}} + {{ $children = where .Children.ByWeight "Identifier" "ne" "all-releases-page" -}} {{ end -}} - {{ range $children -}} - {{ .Name }} - {{- end -}} -
      -
    + {{ end -}} + {{ range $children -}} +
  • {{ .Name }}
    • + {{- end -}} + {{ else -}} {{ $topHidden := false }}