diff --git a/assets/css/_variables/base.scss b/assets/css/_variables/base.scss index 0fcd2b7..26c1802 100644 --- a/assets/css/_variables/base.scss +++ b/assets/css/_variables/base.scss @@ -68,8 +68,12 @@ $card-bg-color-dark : $black-light; $menu-item-bg-color : $whitesmoke; $menu-item-bg-color-dark : $black-light; -$theme-color : convert($theme_color_light); -$theme-color-dark : convert($theme_color_dark); +// TODO why there need convert +//$theme-color : convert($theme_color_light); +//$theme-color-dark : convert($theme_color_dark); + +$theme-color : $theme_color_light; +$theme-color-dark : $theme_color_dark; // Typography // Font, line-height, and elements colors. diff --git a/exampleSite/config.yaml b/exampleSite/config.yaml index f67a226..2bc5678 100644 --- a/exampleSite/config.yaml +++ b/exampleSite/config.yaml @@ -80,9 +80,7 @@ params: #android_manifest: /manifest.json # Custom Logo (Warning: Do not support scheme Mist) - customLogo: - show: false - url: /imgs/hugo_next_logo.png + customLogo: #/imgs/hugo_next_logo.png # Creative Commons 4.0 International License. # See: https://creativecommons.org/about/cclicenses/ @@ -149,7 +147,7 @@ params: # Manual define the sidebar width. If commented, will be default for: # Muse | Mist: 320 # Pisces | Gemini: 240 - width: 300 + width: 240 # Sidebar Display (only for Muse | Mist), available values: # - post expand on posts automatically. Default. diff --git a/i18n/en-us.yaml b/i18n/en-us.yaml index a46d760..b4ca595 100644 --- a/i18n/en-us.yaml +++ b/i18n/en-us.yaml @@ -2,6 +2,9 @@ # English Version #-------------------------------------- +NavToggleLabel: + other: Toggle navigation bar + ColoneFlag: other: ":" diff --git a/i18n/zh-cn.yaml b/i18n/zh-cn.yaml index 0a702e0..7451151 100644 --- a/i18n/zh-cn.yaml +++ b/i18n/zh-cn.yaml @@ -2,6 +2,9 @@ # 中文版本 #-------------------------------------- +NavToggleLabel: + other: 切换导航栏 + ColoneFlag: other: ":" diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html index 68721f4..9f96ec6 100644 --- a/layouts/_default/baseof.html +++ b/layouts/_default/baseof.html @@ -25,7 +25,7 @@
- {{- partial "header" . }} + {{- partial "header" (dict "P" $P "Page" .Page) }}
{{- if ne $P.sidebar.display "remove" }} diff --git a/layouts/partials/head/meta.html b/layouts/partials/head/meta.html index d5d7ea9..b2a378f 100644 --- a/layouts/partials/head/meta.html +++ b/layouts/partials/head/meta.html @@ -27,7 +27,7 @@ - + diff --git a/layouts/partials/header.html b/layouts/partials/header.html index e69de29..bf3bd31 100644 --- a/layouts/partials/header.html +++ b/layouts/partials/header.html @@ -0,0 +1 @@ +{{ partial "header/brand" . }} \ No newline at end of file diff --git a/layouts/partials/header/brand.html b/layouts/partials/header/brand.html new file mode 100644 index 0000000..41450d8 --- /dev/null +++ b/layouts/partials/header/brand.html @@ -0,0 +1,36 @@ +{{ $title := .Page.Site.Title }} +
+ + +
+ {{- if and .P.customLogo (eq .P.scheme "Muse") }} + {{ $title }} + {{- end }} + + + +

{{ $title }}

+ +
+ {{ if isset .P "subtitle" }} +

{{ .P.subtitle }}

+ {{- end }} + {{- if and .P.customLogo (or (eq .P.scheme "Gemini") (eq .P.scheme "Pisces"))}} + {{ $title }} + {{- end }} +
+ + +
\ No newline at end of file