Skip to content

Menu: only expand active hierarchy (fixes #195) #355

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

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Menu: only expand active hierarchy (fixes #195) #355

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
daf3098
Have sub menus collapsed
matcornic Dec 10, 2019
3ebf61c
Merge origin/master into master
oldenboom Dec 18, 2019
d284781
cosmetic changes to better match the master
oldenboom Dec 18, 2019
40892b6
Another cosmetic change
oldenboom Dec 18, 2019
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
17 changes: 12 additions & 5 deletions layouts/partials/menu.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,18 +97,25 @@ <h3>{{ if not $disableShortcutsTitle}}{{ T "Shortcuts-Title"}}{{ end }}</h3>
{{with .sect}}
{{if .IsSection}}
{{safeHTML .Params.head}}
<li data-nav-id="{{.RelPermalink}}" title="{{.Title}}" class="dd-item
{{if .IsAncestor $currentNode }}parent{{end}}
{{ $isParent := or (.IsAncestor $currentNode) (.Params.alwaysopen) }}
{{ $numberOfPages := (add (len .Pages) (len .Sections)) }}
<li data-nav-id="{{.URL}}" title="{{.Title}}" class="dd-item
{{if $isParent }}parent{{end}}
{{if eq .File.UniqueID $currentNode.File.UniqueID}}active{{end}}
{{if .Params.alwaysopen}}parent{{end}}
">
<a href="{{.RelPermalink}}">
{{safeHTML .Params.Pre}}{{or .Params.menuTitle .LinkTitle .Title}}{{safeHTML .Params.Post}}
{{ if and (ne $numberOfPages 0) (ne .Parent .Site.Home) }}
{{if $isParent }}
<i class="fas fa-caret-down"></i>
{{ else }}
<i class="fas fa-caret-right"></i>
{{ end }}
{{ end }}
{{ if $showvisitedlinks}}
<i class="fas fa-check read-icon"></i>
<i class="fas read-icon"></i>
{{ end }}
</a>
{{ $numberOfPages := (add (len .Pages) (len .Sections)) }}
{{ if ne $numberOfPages 0 }}
<ul>
{{ $currentNode.Scratch.Set "pages" .Pages }}
Expand Down
6 changes: 5 additions & 1 deletion static/css/theme.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,11 @@ textarea:focus, input[type="email"]:focus, input[type="number"]:focus, input[typ
padding-bottom: 0;
}
#sidebar ul.topics li.parent ul, #sidebar ul.topics > li.active ul {
display: block;
display: none;
}

nav#sidebar ul.topics li.parent > ul {
display: block;
}
#sidebar ul.topics > li > a {
line-height: 2rem;
Expand Down