whentimeslows/website
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #28521 from seokho-son/fixdocsythm

Browse Source 
Fix sidebar-tree indentation by updating layout with latest docsy theme
This commit is contained in:
Kubernetes Prow Robot
2021-06-24 19:56:45 -07:00
committed by GitHub
parent cafede5fb9 e26ff03d29
commit dc8882da98
1 changed files with 70 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
layouts/partials/sidebar-tree.html
+70 -41
View File
@@ -1,5 +1,6 @@
{{/* We cache this partial for bigger sites and set the active class client side. */}} {{/* We cache this partial for bigger sites and set the active class client side. */}}
{{ $shouldDelayActive := ge (len .Site.Pages) 2000 }} {{ $sidebarCacheLimit := cond (isset .Site.Params.ui "sidebar_cache_limit") .Site.Params.ui.sidebar_cache_limit 2000 }}
{{ $shouldDelayActive := ge (len .Site.Pages) $sidebarCacheLimit }}
<div id="td-sidebar-menu" class="td-sidebar__inner{{ if $shouldDelayActive }} d-none{{ end }}"> <div id="td-sidebar-menu" class="td-sidebar__inner{{ if $shouldDelayActive }} d-none{{ end }}">
{{ if not .Site.Params.ui.sidebar_search_disable }} {{ if not .Site.Params.ui.sidebar_search_disable }}
<form class="td-sidebar__search d-flex align-items-center"> <form class="td-sidebar__search d-flex align-items-center">
@@ -7,57 +8,85 @@
<button class="btn btn-link td-sidebar__toggle d-md-none p-0 ml-3 fas fa-bars" type="button" data-toggle="collapse" data-target="#td-section-nav" aria-controls="td-docs-nav" aria-expanded="false" aria-label="Toggle section navigation"> <button class="btn btn-link td-sidebar__toggle d-md-none p-0 ml-3 fas fa-bars" type="button" data-toggle="collapse" data-target="#td-section-nav" aria-controls="td-docs-nav" aria-expanded="false" aria-label="Toggle section navigation">
</button> </button>
</form> </form>
{{ else }}
<div id="content-mobile">
<form class="td-sidebar__search d-flex align-items-center">
{{ partial "search-input.html" . }}
<button class="btn btn-link td-sidebar__toggle d-md-none p-0 ml-3 fas fa-bars" type="button" data-toggle="collapse" data-target="#td-section-nav" aria-controls="td-docs-nav" aria-expanded="false" aria-label="Toggle section navigation">
</button>
</form>
</div>
<div id="content-desktop"></div>
{{ end }} {{ end }}
<nav class="collapse td-sidebar-nav" id="td-section-nav"> <nav class="collapse td-sidebar-nav{{ if .Site.Params.ui.sidebar_menu_foldable }} foldable-nav{{ end }}" id="td-section-nav">
<!-- {{ if (gt (len .Site.Home.Translations) 0) }} <!-- {{ if (gt (len .Site.Home.Translations) 0) }}
<div class="nav-item dropdown d-block d-lg-none"> <div class="nav-item dropdown d-block d-lg-none">
{{ partial "navbar-lang-selector.html" . }} {{ partial "navbar-lang-selector.html" . }}
</div> </div>
{{ end }} --> {{ end }} -->
<!-- {{ $navRoot := cond (and (ne .Params.toc_root true) (eq .Site.Home.Type "docs")) .Site.Home .FirstSection }} -->
{{ $ulNr := 0 }}
{{ $ulShow := cond (isset .Site.Params.ui "ul_show") .Site.Params.ui.ul_show 1 }}
{{ $sidebarMenuTruncate := cond (isset .Site.Params.ui "sidebar_menu_truncate") .Site.Params.ui.sidebar_menu_truncate 50 }}
{{ $currentLang := .Site.Language }} {{ $currentLang := .Site.Language }}
{{ template "section-tree-nav-section" (dict "page" . "section" .FirstSection "delayActive" $shouldDelayActive "currentLang" $currentLang) }} <ul class="td-sidebar-nav__section pr-md-3 ul-{{ $ulNr }}">
{{ template "section-tree-nav-section" (dict "page" . "section" $navRoot "shouldDelayActive" $shouldDelayActive "sidebarMenuTruncate" $sidebarMenuTruncate "ulNr" $ulNr "ulShow" (add $ulShow 1) "currentLang" $currentLang) }}
</ul>
</nav> </nav>
</div> </div>
{{ define "section-tree-nav-section" }} {{ define "section-tree-nav-section" }}
{{ $s := .section }} {{ $s := .section }}
{{ $p := .page }} {{ $p := .page }}
{{ $shouldDelayActive := .delayActive }} {{ $shouldDelayActive := .shouldDelayActive }}
{{ $active := eq $p.CurrentSection $s }} {{ $sidebarMenuTruncate := .sidebarMenuTruncate }}
{{ $show := or (eq $s $p.FirstSection) (and (not $p.Site.Params.ui.sidebar_menu_compact) ($p.IsDescendant $s)) }} {{ $treeRoot := cond (eq .ulNr 0) true false }}
{{ $sid := $s.RelPermalink | anchorize }} {{ $ulNr := .ulNr }}
<ul class="td-sidebar-nav__section pr-md-3"> {{ $ulShow := .ulShow }}
{{ if (ne $s.File.Path "docs/_index.md") }} {{ $active := and (not $shouldDelayActive) (eq $s $p) }}
<li class="td-sidebar-nav__section-title"> {{ $activePath := and (not $shouldDelayActive) ($p.IsDescendant $s) }}
<a href="{{ $s.RelPermalink }}" class="align-left pl-0 pr-2{{ if not $show }} collapsed{{ end }}{{ if $active}} active{{ end }} td-sidebar-link td-sidebar-link__section"> {{ $show := cond (or (lt $ulNr $ulShow) $activePath (and (not $shouldDelayActive) (eq $s.Parent $p.Parent)) (and (not $shouldDelayActive) (eq $s.Parent $p)) (and (not $shouldDelayActive) ($p.IsDescendant $s.Parent))) true false }}
{{ $s.LinkTitle }} {{ $mid := printf "m-%s" ($s.RelPermalink | anchorize) }}
</a> {{ $pages_tmp := where (union $s.Pages $s.Sections).ByWeight ".Params.toc_hide" "!=" true }}
</li> {{ $pages := $pages_tmp | first $sidebarMenuTruncate }}
{{ end }} {{ $withChild := gt (len $pages) 0 }}
<ul> {{ $manualLink := cond (isset $s.Params "manuallink") $s.Params.manualLink ( cond (isset $s.Params "manuallinkrelref") (relref $s $s.Params.manualLinkRelref) $s.RelPermalink) }}
<li class="collapse {{ if $show }}show{{ end }}" id="{{ $sid }}"> {{ $manualLinkTitle := cond (isset $s.Params "manuallinktitle") $s.Params.manualLinkTitle $s.Title }}
{{ $pages := where (union $s.Pages $s.Sections).ByWeight ".Params.toc_hide" "!=" true }}
{{ with site.Params.language_alternatives }} <li class="td-sidebar-nav__section-title td-sidebar-nav__section{{ if $withChild }} with-child{{ else }} without-child{{ end }}{{ if $activePath }} active-path{{ end }}{{ if (not (or $show $p.Site.Params.ui.sidebar_menu_foldable )) }} collapse{{ end }}" id="{{ $mid }}-li">
{{ range . }} {{ if (and $p.Site.Params.ui.sidebar_menu_foldable (ge $ulNr 1)) }}
{{ with (where $.section.Translations ".Lang" . ) }} <input type="checkbox" id="{{ $mid }}-check"{{ if $activePath}} checked{{ end }}/>
{{ $p := index . 0 }} <label for="{{ $mid }}-check"><a href="{{ $manualLink }}"{{ if ne $s.LinkTitle $manualLinkTitle }} title="{{ $manualLinkTitle }}"{{ end }}{{ with $s.Params.manualLinkTarget }} target="{{ . }}"{{ if eq . "_blank" }} rel="noopener"{{ end }}{{ end }} class="align-left pl-0 {{ if $active}} active{{ end }} td-sidebar-link{{ if $s.IsPage }} td-sidebar-link__page{{ else }} td-sidebar-link__section{{ end }}{{ if $treeRoot }} tree-root{{ end }}" id="{{ $mid }}">{{ with $s.Params.Icon}}<i class="{{ . }}"></i>{{ end }}<span class="{{ if $active }}td-sidebar-nav-active-item{{ end }}">{{ $s.LinkTitle }}</span></a></label>
{{ $pages = $pages | lang.Merge (union $p.Pages $p.Sections) }} {{ else }}
<a href="{{ $manualLink }}"{{ if ne $s.LinkTitle $manualLinkTitle }} title="{{ $manualLinkTitle }}"{{ end }}{{ with $s.Params.manualLinkTarget }} target="{{ . }}"{{ if eq . "_blank" }} rel="noopener"{{ end }}{{ end }} class="align-left pl-0{{ if $active}} active{{ end }} td-sidebar-link{{ if $s.IsPage }} td-sidebar-link__page{{ else }} td-sidebar-link__section{{ end }}{{ if $treeRoot }} tree-root{{ end }}" id="{{ $mid }}">{{ with $s.Params.Icon}}<i class="{{ . }}"></i>{{ end }}<span class="{{ if $active }}td-sidebar-nav-active-item{{ end }}">{{ $s.LinkTitle }}</span></a>
{{ end }}
{{if $withChild }}
{{ $ulNr := add $ulNr 1 }}
<ul class="ul-{{ $ulNr }}{{ if (gt $ulNr 1)}} foldable{{end}}">
{{ $pages := where (union $s.Pages $s.Sections).ByWeight ".Params.toc_hide" "!=" true }}
{{ with site.Params.language_alternatives }}
{{ range . }}
{{ with (where $.section.Translations ".Lang" . ) }}
{{ $p := index . 0 }}
{{ $pages = $pages | lang.Merge (union $p.Pages $p.Sections) }}
{{ end }}
{{ end }} {{ end }}
{{ end }} {{ end }}
{{ end }} {{ $pages := $pages | first 50 }}
{{ $pages := $pages | first 50 }} {{ range $pages }}
{{ range $pages }} {{ if (not (and (eq $s $p.Site.Home) (eq .Params.toc_root true)) ) }}
{{ if .IsPage }} {{ $mid := printf "m-%s" (.RelPermalink | anchorize) }}
{{ $mid := printf "m-%s" (.RelPermalink | anchorize) }} {{ $active := eq . $p }}
{{ $active := eq . $p }} {{ $isForeignLanguage := (ne (string .Lang) (string $.currentLang)) }}
{{ $isForeignLanguage := (ne (string .Lang) (string $.currentLang)) }} {{ if (and $isForeignLanguage ($p.IsDescendant $s)) }}
<a class="td-sidebar-link td-sidebar-link__page {{ if and (not $shouldDelayActive) $active }} active{{ end }}" id="{{ $mid }}" {{ if $isForeignLanguage }}target="_blank"{{ end }} href="{{ .RelPermalink }}"> <a class="td-sidebar-link td-sidebar-link__page {{ if and (not $shouldDelayActive) $active }} active{{ end }}" id="{{ $mid }}" {{ if $isForeignLanguage }}target="_blank"{{ end }} href="{{ .RelPermalink }}">
{{ .LinkTitle }}{{ if $isForeignLanguage }} <small>({{ .Lang | upper }})</small>{{ end }} {{ .LinkTitle }}{{ if $isForeignLanguage }} <small>({{ .Lang | upper }})</small>{{ end }}
</a> </a>
{{ else }} {{ else }}
{{ template "section-tree-nav-section" (dict "page" $p "section" . "currentLang" $.currentLang) }} {{ template "section-tree-nav-section" (dict "page" $p "section" . "currentLang" $.currentLang "shouldDelayActive" $shouldDelayActive "sidebarMenuTruncate" $sidebarMenuTruncate "ulNr" $ulNr "ulShow" $ulShow) }}
{{ end }}
{{ end }}
{{ end }} {{ end }}
{{ end }} </ul>
</li> {{ end }}
</ul> </li>
</ul>
{{ end }} {{ end }}