mirror of
https://github.com/McShelby/hugo-theme-relearn.git
synced 2024-11-27 01:33:04 +00:00
Fix conflicts
This commit is contained in:
commit
982b7290b3
2 changed files with 15 additions and 7 deletions
|
@ -40,12 +40,15 @@
|
||||||
{{ end }}
|
{{ end }}
|
||||||
|
|
||||||
|
|
||||||
{{with ($.Scratch.Get "prevPage")}}
|
{{$showPrevNext := (and (not .Params.disableNextPrev) (not .Site.Params.disableNextPrev))}}
|
||||||
<a class="nav nav-prev" href="{{.URL}}" title="{{.Title}}"> <i class="fas fa-chevron-left"></i></a>
|
{{if $showPrevNext}}
|
||||||
{{end}}
|
{{with ($.Scratch.Get "prevPage")}}
|
||||||
{{with ($.Scratch.Get "nextPage")}}
|
<a class="nav nav-prev" href="{{.URL}}" title="{{.Title}}"> <i class="fa fa-chevron-left"></i></a>
|
||||||
<a class="nav nav-next" href="{{.URL}}" title="{{.Title}}" style="margin-right: 0px;"><i class="fas fa-chevron-right"></i></a>
|
{{end}}
|
||||||
{{end}}
|
{{with ($.Scratch.Get "nextPage")}}
|
||||||
|
<a class="nav nav-next" href="{{.URL}}" title="{{.Title}}" style="margin-right: 0px;"><i class="fa fa-chevron-right"></i></a>
|
||||||
|
{{end}}
|
||||||
|
{{end}}
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
</section>
|
</section>
|
||||||
|
|
|
@ -66,7 +66,12 @@
|
||||||
<span id="toc-menu"><i class="fas fa-list-alt"></i></span>
|
<span id="toc-menu"><i class="fas fa-list-alt"></i></span>
|
||||||
{{ end }}
|
{{ end }}
|
||||||
<span class="links">
|
<span class="links">
|
||||||
{{ template "breadcrumb" dict "page" . "value" .Title }}
|
{{$showBreadcrumb := (and (not .Params.disableBreadcrumb) (not .Site.Params.disableBreadcrumb))}}
|
||||||
|
{{if $showBreadcrumb}}
|
||||||
|
{{ template "breadcrumb" dict "page" . "value" .Title }}
|
||||||
|
{{ else }}
|
||||||
|
{{ .Title }}
|
||||||
|
{{ end }}
|
||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
{{ if $toc }}
|
{{ if $toc }}
|
||||||
|
|
Loading…
Reference in a new issue