diff options
| -rw-r--r-- | assets/css/_partial/_header.scss | 20 | ||||
| -rw-r--r-- | assets/css/_ublogger.scss | 14 | ||||
| -rw-r--r-- | layouts/_default/baseof.html | 2 | ||||
| -rw-r--r-- | layouts/_default/section.html | 2 | ||||
| -rw-r--r-- | layouts/partials/breadcrumbs.html | 24 | ||||
| -rw-r--r-- | layouts/partials/header.html | 43 | ||||
| -rw-r--r-- | layouts/partials/init.html | 2 | ||||
| -rw-r--r-- | layouts/taxonomy/list.html | 2 | ||||
| -rw-r--r-- | layouts/taxonomy/terms.html | 2 |
9 files changed, 78 insertions, 33 deletions
diff --git a/assets/css/_partial/_header.scss b/assets/css/_partial/_header.scss index c4955ca..39d7a6c 100644 --- a/assets/css/_partial/_header.scss +++ b/assets/css/_partial/_header.scss @@ -166,8 +166,19 @@ header { overflow: hidden; white-space: nowrap; + nav { + display: inline-block; + } + + ul { + li { + list-style: none; + display: inline-block; + } + } + .menu-inner { - float: right; + margin: 0; } .menu-item { @@ -284,6 +295,13 @@ header { padding-top: .5rem; @include box-shadow(0 .125rem .25rem rgba(0, 0, 0, .1)); + ul { + padding: 0; + li { + list-style: none; + } + } + .search-wrapper { display: flex; justify-content: space-between; diff --git a/assets/css/_ublogger.scss b/assets/css/_ublogger.scss index 4fa1c27..23182b4 100644 --- a/assets/css/_ublogger.scss +++ b/assets/css/_ublogger.scss @@ -579,6 +579,20 @@ footer { a { color: #a9a9b3; } + + ol { + margin: 0; + padding: 0; + li { + display: inline-block; + list-style: none; + } + + li:not(:first-child):before { + content: "/"; + margin: 0 3px 0 3px; + } + } } .page-toc { diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html index a8b4886..f03e486 100644 --- a/layouts/_default/baseof.html +++ b/layouts/_default/baseof.html @@ -5,7 +5,7 @@ <head> <meta charset="utf-8"> <meta name="viewport" content="width=device-width, initial-scale=1"> - {{- block "robots" . }}<meta name="robots" content="noodp" />{{ end -}} + {{- block "robots" . }}<meta name="robots" content="noodp"/>{{ end -}} <title> {{- block "title" . }}{{ .Site.Title }}{{ end -}} </title> diff --git a/layouts/_default/section.html b/layouts/_default/section.html index b476ebf..10d953c 100644 --- a/layouts/_default/section.html +++ b/layouts/_default/section.html @@ -3,7 +3,7 @@ {{- end -}} {{- define "robots" -}} -<meta name="robots" content="noindex, follow" /> +<meta name="robots" content="noindex, follow"/> {{- end -}} {{- define "content" -}} diff --git a/layouts/partials/breadcrumbs.html b/layouts/partials/breadcrumbs.html index f6c9b4c..742f7da 100644 --- a/layouts/partials/breadcrumbs.html +++ b/layouts/partials/breadcrumbs.html @@ -1,11 +1,13 @@ -<div class="breadcrumbs"> - <a href="{{ .Site.Home.RelPermalink }}">{{ T "home" }} </a> - {{- with $.Params.categories -}} - {{- $category := index . 0 -}} - {{- with $category -}} - {{- $category = partialCached "function/path.html" . . | printf "/categories/%v" | $.Site.GetPage -}} - / <a href="{{ $category.RelPermalink }}">{{ $category.Title }} </a> - {{- end -}} - {{- end -}} - / <a href="/"> {{ .Title }} </a> -</div>
\ No newline at end of file +<nav class="breadcrumbs"> + <ol> + <li><a href="{{ .Site.Home.RelPermalink }}">{{ T "home" }} </a></li> + {{- with $.Params.categories -}} + {{- $category := index . 0 -}} + {{- with $category -}} + {{- $category = partialCached "function/path.html" . . | printf "/categories/%v" | $.Site.GetPage -}} + <li><a href="{{ $category.RelPermalink }}">{{ $category.Title }} </a></li> + {{- end -}} + {{- end -}} + <li>{{ .Title }}</li> + </ol> +</nav>
\ No newline at end of file diff --git a/layouts/partials/header.html b/layouts/partials/header.html index 4087190..fa6337f 100644 --- a/layouts/partials/header.html +++ b/layouts/partials/header.html @@ -28,16 +28,21 @@ </a> </div> <div class="menu"> - <div class="menu-inner"> - {{- range .Site.Menus.main -}} + <nav> + <ul class="menu-inner"> + {{- range .Site.Menus.main -}} {{- $url := .URL | relLangURL -}} {{- with .Page -}} - {{- $url = .RelPermalink -}} + {{- $url = .RelPermalink -}} {{- end -}} - <a class="menu-item{{ if $.IsMenuCurrent `main` . | or ($.HasMenuCurrent `main` .) | or (eq $.RelPermalink $url) }} active{{ end }}" href="{{ $url }}"{{ with .Title }} title="{{ . }}"{{ end }}{{ if (urls.Parse $url).Host }} rel="noopener noreffer" target="_blank"{{ end }}> - {{- .Pre | safeHTML }} {{ .Name }} {{ .Post | safeHTML -}} - </a> - {{- end -}} + <li> + <a class="menu-item{{ if $.IsMenuCurrent `main` . | or ($.HasMenuCurrent `main` .) | or (eq $.RelPermalink $url) }} active{{ end }}" href="{{ $url }}"{{ with .Title }} title="{{ . }}"{{ end }}{{ if (urls.Parse $url).Host }} rel="noopener noreffer" target="_blank"{{ end }}> + {{- .Pre | safeHTML }} {{ .Name }} {{ .Post | safeHTML -}} + </a> + </li> + {{- end -}} + </ul> + </nav> {{- if .Site.Menus.main -}} <span class="menu-item delimiter"></span> {{- end -}} @@ -80,7 +85,7 @@ <span class="svg-icon icon-moon"></span> </a> </div> - </div> + </nav> </div> </header> @@ -139,15 +144,21 @@ </div> {{- end -}} {{- $currentPage := . -}} - {{- range .Site.Menus.main -}} - {{- $url := .URL | relLangURL -}} - {{- with .Page -}} + <nav> + <ul> + {{- range .Site.Menus.main -}} + {{- $url := .URL | relLangURL -}} + {{- with .Page -}} {{- $url = .RelPermalink -}} - {{- end -}} - <a class="menu-item" href="{{ $url }}" title="{{ .Title }}"{{ if (urls.Parse $url).Host }} rel="noopener noreffer" target="_blank"{{ end }}> - {{- .Pre | safeHTML }}{{ .Name }}{{ .Post | safeHTML -}} - </a> - {{- end -}} + {{- end -}} + <li> + <a class="menu-item" href="{{ $url }}" title="{{ .Title }}"{{ if (urls.Parse $url).Host }} rel="noopener noreffer" target="_blank"{{ end }}> + {{- .Pre | safeHTML }}{{ .Name }}{{ .Post | safeHTML -}} + </a> + </li> + {{- end -}} + </ul> + </nav> <a href="javascript:void(0);" class="menu-item theme-switch" title="{{ T "switchTheme" }}"> <span class="svg-icon icon-moon"></span> </a> diff --git a/layouts/partials/init.html b/layouts/partials/init.html index cb7f167..c1fe61c 100644 --- a/layouts/partials/init.html +++ b/layouts/partials/init.html @@ -1,4 +1,4 @@ -{{- .Scratch.Set "version" "2.0.0" -}} +{{- .Scratch.Set "version" "2.0.1" -}} {{- /* uBlogger theme version detection */ -}} {{- $VERSION := "2.0.X" -}} diff --git a/layouts/taxonomy/list.html b/layouts/taxonomy/list.html index 708952d..afdc4be 100644 --- a/layouts/taxonomy/list.html +++ b/layouts/taxonomy/list.html @@ -3,7 +3,7 @@ {{- end -}} {{- define "robots" -}} -<meta name="robots" content="noindex, follow" /> +<meta name="robots" content="noindex, follow"/> {{- end -}} {{- define "content" -}} diff --git a/layouts/taxonomy/terms.html b/layouts/taxonomy/terms.html index a24ab95..6e6edc4 100644 --- a/layouts/taxonomy/terms.html +++ b/layouts/taxonomy/terms.html @@ -3,7 +3,7 @@ {{- end -}} {{- define "robots" -}} -<meta name="robots" content="noindex, follow" /> +<meta name="robots" content="noindex, follow"/> {{- end -}} {{- define "content" -}} |