Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: incorrect display of submenu items when multiple menu dropdowns are implemented #354

Merged
merged 7 commits into from
May 13, 2022
Merged

fix: incorrect display of submenu items when multiple menu dropdowns are implemented #354

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
d5fbd52
updated fontawesome *.min.css files format to resolve integrity check…
guidemetothemoon Mar 24, 2022
a9523ff
Merge branch 'lxndrblz:master' into master
guidemetothemoon Apr 9, 2022
1d0d62b
Merge branch 'master' of https://github.com/lxndrblz/anatole
guidemetothemoon Apr 23, 2022
de82fe0
fix: incorrect display when multiple dropdown menus are implemented
guidemetothemoon May 2, 2022
24520dc
Merge remote-tracking branch 'upstream/master' into fix/multiple-menu…
guidemetothemoon May 2, 2022
4804436
fix: changed menu id shuffle to increment
guidemetothemoon May 5, 2022
f646f16
refactor: simplify code structure
lxndrblz May 13, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 10 additions & 13 deletions layouts/partials/navbar.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,33 +15,30 @@
<nav class="nav">
<ul class="nav__list" id="navMenu">
{{ $url := .RelPermalink }}
{{ $current := . }}
{{ range .Site.Menus.main }}
{{ $active := eq $url .URL }}
{{ if .HasChildren }}
{{ range $menuId, $menuItem := .Site.Menus.main }}
{{ $active := eq $url $menuItem.URL }}
{{ if $menuItem.HasChildren }}
<li class="nav__list-item">
<div class="optionswitch">
<input class="optionswitch__picker" type="checkbox" id="menuoptionpicker" hidden />
<input class="optionswitch__picker" type="checkbox" id="{{ $menuId }}" hidden />

{{ $labelClass := "optionswitch__label" }}
{{ range .Children }}
{{ range $menuItem.Children }}
{{ if eq $url .URL }}
{{ $labelClass = "optionswitch__label nav__link--active" }}


{{ end }}


{{ end }}


<label class="{{ $labelClass }}" for="menuoptionpicker"
>{{ .Name }} <i class="fa fa-angle-down" aria-hidden="true"></i
<label class="{{ $labelClass }}" for="{{ $menuId }}"
>{{ $menuItem.Name }} <i class="fa fa-angle-down" aria-hidden="true"></i
></label>

<div class="optionswitch__triangle"></div>
<ul class="optionswitch__list">
{{ range .Children }}
{{ range $menuItem.Children }}
<li class="optionswitch__list-item">
<a
href="{{ .URL }}"
Expand Down Expand Up @@ -72,7 +69,7 @@

{{ end }}
title="{{ .Title }}"
>{{ .Name }}</a
>{{ $menuItem.Name }}</a
>
</li>

Expand Down