diff options
| author | Fabian Tamp <fabian.tamp@gmail.com> | 2020-08-18 23:41:02 +0300 |
|---|---|---|
| committer | Fabian Tamp <fabian.tamp@gmail.com> | 2020-08-18 23:43:15 +0300 |
| commit | ed4331a17ea1586555eff36413fbea94eccd5425 (patch) | |
| tree | 7980476f2e021436a881787d49efaeca0e4f4f40 | |
| parent | 08ed3d9a5b5ec37afb1c7f0f45ee10d6976da3f1 (diff) | |
Factor out the nav bar.
From this commit, I've checked everything with manual diffing.
| -rw-r--r-- | layouts/_default/baseof.html | 8 | ||||
| -rw-r--r-- | layouts/_default/list.html | 7 | ||||
| -rw-r--r-- | layouts/_default/single.html | 19 | ||||
| -rw-r--r-- | layouts/index.html | 7 | ||||
| -rw-r--r-- | layouts/posts/single.html | 14 | ||||
| -rw-r--r-- | layouts/taxonomy/taxonomy.html | 15 | ||||
| -rw-r--r-- | layouts/taxonomy/terms.html | 8 |
7 files changed, 25 insertions, 53 deletions
diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html index 82f2ca7..8948de7 100644 --- a/layouts/_default/baseof.html +++ b/layouts/_default/baseof.html @@ -26,6 +26,14 @@ <body class="{{ block "body-classes" . }}{{ end }}" lang="{{ .Site.LanguageCode }}"> + <div class="nav-bkg"> + <nav class="content-container pagewide-bar-padding"> + <span class="divider">/ </span> + <a href="{{ .Site.BaseURL }}" >{{ .Site.Title }}</a> + {{ block "breadcrumbs" . }}{{ end }} + {{ partial "right-links" . }} + </nav> + </div> {{ block "content" . }}{{ end }} {{ partial "footer.html" . }} </body> diff --git a/layouts/_default/list.html b/layouts/_default/list.html index 7c60a4e..6764af7 100644 --- a/layouts/_default/list.html +++ b/layouts/_default/list.html @@ -1,11 +1,4 @@ {{ define "content" }} - <div class="nav-bkg"> - <nav class="content-container pagewide-bar-padding"> - <span class="divider">/ </span> - <a href="{{ .Site.BaseURL }}" >{{ .Site.Title }}</a> - {{ partial "right-links" . }} - </nav> - </div> <section id="main" class="content-container article-pad-v"> <div> <h1 id="title" style="margin-bottom: 0.75em">{{.CurrentSection.Name}}</h1> diff --git a/layouts/_default/single.html b/layouts/_default/single.html index dc3e4cd..79a3e5e 100644 --- a/layouts/_default/single.html +++ b/layouts/_default/single.html @@ -1,19 +1,14 @@ {{ define "body-classes" -}} look-sheet-bkg {{- end }} -{{ define "content" }} -<div class="nav-bkg"> - <nav class="content-container pagewide-bar-padding"> - <span class="divider">/ </span> - <a href="{{ .Site.BaseURL }}" >{{ .Site.Title }}</a> - {{- if not .Parent.IsHome -}} - <span class="divider">/ </span> - <a href="{{ .Site.BaseURL }}{{ .CurrentSection.Type }}">{{.CurrentSection.Name}}</a> - {{- end -}} - {{ partial "right-links" . }} - </nav> -</div> +{{ define "breadcrumbs" }} + {{- if not .Parent.IsHome -}} + <span class="divider">/ </span> + <a href="{{ .Site.BaseURL }}{{ .CurrentSection.Type }}">{{.CurrentSection.Name}}</a> + {{- end -}} +{{ end }} +{{ define "content" }} <section id="main" class="content-container look-sheet article-pad-v {{ if (or .Params.disableMarginNotes .Site.Params.disableMarginNotes) }}no-floating-footnotes{{ end }}" itemprop="mainEntityOfPage"> <h1 itemprop="name" id="title">{{ .Title }}</h1> {{ if .Date }} diff --git a/layouts/index.html b/layouts/index.html index 46f9ba8..0161c80 100644 --- a/layouts/index.html +++ b/layouts/index.html @@ -1,11 +1,4 @@ {{ define "content" }} -<div class="nav-bkg"> - <nav class="content-container pagewide-bar-padding"> - <span class="divider">/ </span> - <a href="{{ .Site.BaseURL }}" >{{ .Site.Title }}</a> - {{ partial "right-links" . }} - </nav> -</div> <section id="main" class="content-container article-pad-v"> <div> diff --git a/layouts/posts/single.html b/layouts/posts/single.html index 27909d9..44ff315 100644 --- a/layouts/posts/single.html +++ b/layouts/posts/single.html @@ -2,17 +2,13 @@ {{ if .Draft }}draft{{ end }} look-sheet-bkg {{- end }} +{{ define "breadcrumbs" }} + <span class="divider">/ </span> + <a href="{{ .Site.BaseURL }}{{ .CurrentSection.Type }}">{{.CurrentSection.Name}}</a> +{{ end }} + {{ define "content" }} -<div class="nav-bkg"> - <nav class="content-container pagewide-bar-padding"> - <span class="divider">/ </span> - <a href="{{ .Site.BaseURL }}" >{{ .Site.Title }}</a> - <span class="divider">/ </span> - <a href="{{ .Site.BaseURL }}{{ .CurrentSection.Type }}">{{.CurrentSection.Name}}</a> - {{ partial "right-links" . }} - </nav> -</div> <article id="main" class="content-container look-sheet article-pad-v {{ if (or .Params.disableMarginNotes .Site.Params.disableMarginNotes) }}no-floating-footnotes{{ end }}" diff --git a/layouts/taxonomy/taxonomy.html b/layouts/taxonomy/taxonomy.html index a3e6d06..10c6176 100644 --- a/layouts/taxonomy/taxonomy.html +++ b/layouts/taxonomy/taxonomy.html @@ -1,14 +1,9 @@ -{{ define "content" }} -<div class="nav-bkg"> - <nav class="content-container pagewide-bar-padding"> - <span class="divider">/ </span> - <a href="{{ .Site.BaseURL }}" >{{ .Site.Title }}</a> - <span class="divider">/ </span> - <a href="{{ .Site.BaseURL }}{{ .Data.Plural }}">{{.Data.Plural}}</a> - {{ partial "right-links" . }} - </nav> -</div> +{{ define "breadcrumbs" }} + <span class="divider">/ </span> + <a href="{{ .Site.BaseURL }}{{ .Data.Plural }}">{{.Data.Plural}}</a> +{{ end }} +{{ define "content" }} <section id="main" class="content-container article-pad-v"> <div> <h1 id="title" style="margin-bottom: 0.75em">{{.Data.Term}}</h1> diff --git a/layouts/taxonomy/terms.html b/layouts/taxonomy/terms.html index 3bbb638..a7e67ac 100644 --- a/layouts/taxonomy/terms.html +++ b/layouts/taxonomy/terms.html @@ -1,12 +1,4 @@ {{ define "content" }} -<div class="nav-bkg"> - <nav class="content-container pagewide-bar-padding"> - <span class="divider">/ </span> - <a href="{{ .Site.BaseURL }}" >{{ .Site.Title }}</a> - {{ partial "right-links" . }} - </nav> -</div> - <section id="main" class="content-container article-pad-v"> <div> <h1 id="title" style="margin-bottom: 0.75em">{{.Data.Plural}}</h1> |