diff options
author | Bjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com> | 2018-05-04 09:44:59 +0200 |
---|---|---|
committer | Bjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com> | 2018-05-04 09:44:59 +0200 |
commit | 914cc85e22af2e6c28f24a5fc70de94e4b9f1b1b (patch) | |
tree | e7b5fcc856003415c613312c80ba2f301eeae03c /docs/themes | |
parent | a6816db77574ba3d48a6414c97a53a691c34e705 (diff) | |
parent | 83bef6955e014d40c0f00db9cebe09113154e999 (diff) |
Merge commit '83bef6955e014d40c0f00db9cebe09113154e999'
Diffstat (limited to 'docs/themes')
6 files changed, 22 insertions, 18 deletions
diff --git a/docs/themes/gohugoioTheme/layouts/_default/list.html b/docs/themes/gohugoioTheme/layouts/_default/list.html index a0835342a..3b7a2307e 100755 --- a/docs/themes/gohugoioTheme/layouts/_default/list.html +++ b/docs/themes/gohugoioTheme/layouts/_default/list.html @@ -1,4 +1,5 @@ {{ define "main" }} - {{ $section_to_display := .Sections | default .Paginator.Pages }} + {{ $paginator := .Paginate (.Pages | lang.Merge (where .Sites.First.RegularPages "Section" .Section)) }} + {{ $section_to_display := .Sections | default $paginator.Pages }} {{ partial "pagelayout.html" (dict "context" . "section_to_display" $section_to_display ) }} {{ end }} diff --git a/docs/themes/gohugoioTheme/layouts/news/list.html b/docs/themes/gohugoioTheme/layouts/news/list.html index 716966e17..5a5284658 100644 --- a/docs/themes/gohugoioTheme/layouts/news/list.html +++ b/docs/themes/gohugoioTheme/layouts/news/list.html @@ -28,7 +28,8 @@ {{ $interior_classes := $.Site.Params.flex_box_interior_classes }} <section class="flex-ns flex-wrap justify-between w-100 w-80-nsTK v-top"> - {{ range .Paginator.Pages }} + {{ $paginator := .Paginate (.Pages | lang.Merge (where .Sites.First.RegularPages "Section" .Section)) -}} + {{ range $paginator.Pages }} {{ partial "boxes-section-summaries" (dict "context" . "classes" $interior_classes "fullcontent" false) }} {{ end }} </section> diff --git a/docs/themes/gohugoioTheme/layouts/page/documentation-home.html b/docs/themes/gohugoioTheme/layouts/page/documentation-home.html index 04b57d4ca..91f744c30 100644 --- a/docs/themes/gohugoioTheme/layouts/page/documentation-home.html +++ b/docs/themes/gohugoioTheme/layouts/page/documentation-home.html @@ -1,4 +1,4 @@ {{ define "main" }} -{{ $section_to_display := (.Site.Taxonomies.categories.fundamentals).Pages }} +{{ $section_to_display := (.Site.Taxonomies.categories.fundamentals).Pages | lang.Merge (.Sites.First.Taxonomies.categories.fundamentals).Pages }} {{ partial "pagelayout.html" (dict "context" . "section_to_display" $section_to_display ) }} {{ end }} diff --git a/docs/themes/gohugoioTheme/layouts/partials/home-page-sections/showcase.html b/docs/themes/gohugoioTheme/layouts/partials/home-page-sections/showcase.html index 774c10e0f..c73cfa5e9 100644 --- a/docs/themes/gohugoioTheme/layouts/partials/home-page-sections/showcase.html +++ b/docs/themes/gohugoioTheme/layouts/partials/home-page-sections/showcase.html @@ -5,10 +5,12 @@ <div class="w-100 overflow-x-scroll"> <div class="row nowrap mv2 pb1"> {{ $showcasePages := where .Site.RegularPages "Section" "showcase" }} + {{ if $showcasePages }} {{ template "home_showcase_item" (index $showcasePages 0) }} {{ range $p := first 10 ($showcasePages | after 1 | shuffle) }} {{template "home_showcase_item" $p }} {{end}} + {{end}} </div> </div> </div> diff --git a/docs/themes/gohugoioTheme/layouts/partials/nav-links-docs.html b/docs/themes/gohugoioTheme/layouts/partials/nav-links-docs.html index d695008c7..61aa11dde 100644 --- a/docs/themes/gohugoioTheme/layouts/partials/nav-links-docs.html +++ b/docs/themes/gohugoioTheme/layouts/partials/nav-links-docs.html @@ -4,20 +4,20 @@ {{ range .Site.Menus.docs.ByWeight }} {{ $post := printf "%s" .Post }} <li class="f5 w-100 hover-bg-light-gray hover-accent-color-light fw8{{ if eq $post "break" }} mb1 bb b--moon-gray{{ end }}"> - <a href="{{ if .HasChildren }}javascript:void(0){{ else }}{{ .URL }}{{ end }}" class="js-toggle dib w-100 link mid-gray hover-accent-color-light pl2 pr2 pv2 {{if or ($currentPage.IsMenuCurrent "docs" .) ($currentPage.HasMenuCurrent "docs" .) }} primary-color{{end}}" data-target=".{{ .Name | urlize }}">{{ .Name }}</a> + <a href="{{ if .HasChildren }}javascript:void(0){{ else }}{{ .URL }}{{ end }}" class="js-toggle dib w-100 link mid-gray hover-accent-color-light pl2 pr2 pv2 {{if or ($currentPage.IsMenuCurrent "docs" .) ($currentPage.HasMenuCurrent "docs" .) }} primary-color{{end}}" data-target=".{{ .Identifier }}">{{ .Name }}</a> - {{ if .HasChildren }} - <ul class="{{ .Name | urlize }} desktopmenu animated fadeIn list pl0 bg-light-gray{{if $currentPage.HasMenuCurrent "docs" . }} db{{ else }} dn{{ end }}"> - {{ range .Children }} - <li class="f6 fw4"> - <a href="{{.URL}}" class="db link hover-bg-gray hover-white pl3 pr2 pv2 {{if $currentPage.IsMenuCurrent "docs" . }}primary-color {{ else }}black {{end}}"> - {{ .Name }} - </a> - </li> - {{ end }} - </ul> - {{end}} - </li> - {{end}} + {{- if .HasChildren }} + <ul class="{{ .Identifier }} desktopmenu animated fadeIn list pl0 bg-light-gray{{if $currentPage.HasMenuCurrent "docs" . }} db{{ else }} dn{{ end }}"> + {{- range .Children }} + <li class="f6 fw4"> + <a href="{{.URL}}" class="db link hover-bg-gray hover-white pl3 pr2 pv2 {{if $currentPage.IsMenuCurrent "docs" . }}primary-color {{ else }}black {{end}}"> + {{ .Name }} + </a> + </li> + {{- end}} + </ul> + {{- end}} + </li> + {{- end}} </ul> </nav> diff --git a/docs/themes/gohugoioTheme/theme.toml b/docs/themes/gohugoioTheme/theme.toml index 7334c0e2e..fe55ec76e 100644 --- a/docs/themes/gohugoioTheme/theme.toml +++ b/docs/themes/gohugoioTheme/theme.toml @@ -8,7 +8,7 @@ description = "" homepage = "https://github.com/budparr/gohugo.io" tags = ["website"] features = ["", ""] -min_version = 0.18 +min_version = 0.38 [author] name = "Bud Parr" |