diff options
| author | Ralf Geschke <ralf@kuerbis.org> | 2018-11-13 12:01:25 +0300 |
|---|---|---|
| committer | Ralf Geschke <ralf@kuerbis.org> | 2018-11-13 12:01:25 +0300 |
| commit | 658999e1fc9d95b38e36d103a1c06f98e2bfaa48 (patch) | |
| tree | aa97232b1ff3e131e1508b40022c320bda9d1757 | |
| parent | 216757bbd0a45555f4f296bd21d4ce2be7238299 (diff) | |
Setting some more senseful default values of standard header and colors
| -rw-r--r-- | layouts/_default/baseof.html | 10 | ||||
| -rw-r--r-- | layouts/partials/footer_container.html | 11 | ||||
| -rw-r--r-- | layouts/partials/head.html | 10 | ||||
| -rw-r--r-- | layouts/partials/header_fixed_top.html | 11 |
4 files changed, 32 insertions, 10 deletions
diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html index 425d2ff..210f807 100644 --- a/layouts/_default/baseof.html +++ b/layouts/_default/baseof.html @@ -3,7 +3,11 @@ {{- partial "head.html" . -}} <body> - {{ if .Site.Params.Navbar.fixedTop }} +{{- $navbarStyle := "fixed-top" -}} +{{- if .Site.Params.Navbar.Style -}} + {{- $navbarStyle = .Site.Params.Navbar.Style -}} +{{- end -}} + {{ if eq $navbarStyle "fixed-top" }} {{- partial "header_fixed_top.html" . -}} {{ else }} {{- partial "header_default.html" . -}} @@ -21,8 +25,8 @@ </div> {{ block "footer" . }} - {{ partial "footer_container.html" . }} - {{ partial "subfooter_container.html" . }} + {{ partial "footer_container.html" . }} + {{ partial "subfooter_container.html" . }} {{ end }} <div id="media-width-detection-element"></div> diff --git a/layouts/partials/footer_container.html b/layouts/partials/footer_container.html index 7c271f0..7b01548 100644 --- a/layouts/partials/footer_container.html +++ b/layouts/partials/footer_container.html @@ -1,10 +1,14 @@ -<div class="footer-container" style=""> +{{- if .Site.Params.Theme.Footer.Enabled -}} + <div class="footer-container" style=""> <div class="container"> <footer> <div class="row"> - + {{- $footerColumns := 3 -}} + {{- if .Site.Params.Theme.Footer.NumberColumns -}} + {{- $footerColumns = .Site.Params.Theme.Footer.NumberColumns -}} + {{- end -}} {{ range first .Site.Params.Theme.Footer.NumberColumns (where .Site.Pages "Section" "footer") }} {{ partial "footer_column.html" . }} @@ -13,4 +17,5 @@ </div> </footer> </div> -</div>
\ No newline at end of file +</div> +{{- end -}}
\ No newline at end of file diff --git a/layouts/partials/head.html b/layouts/partials/head.html index d9103cf..83a8453 100644 --- a/layouts/partials/head.html +++ b/layouts/partials/head.html @@ -48,9 +48,13 @@ {{- $overlayBackgroundColor := printf " rgba(%d,%d,%d,%s)" $rr $gg $bb $overlayBackgroundTranspHex -}} <style> -body { +{{- $navbarStyle := "fixed-top" -}} +{{- if .Site.Params.Navbar.Style -}} + {{- $navbarStyle = .Site.Params.Navbar.Style -}} +{{- end -}} - {{- if .Site.Params.Navbar.fixedTop -}} +body { + {{- if eq $navbarStyle "fixed-top" -}} /* Move down content because we have a fixed navbar that is 60px tall */ {{- $paddingTop := 60 -}} @@ -251,7 +255,7 @@ body { </style> -{{ if not .Site.Params.Navbar.FixedTop }} +{{ if eq $navbarStyle "header" }} {{/* if and .Site.Params.Theme.Header.header_background_transp .Site.Params.Theme.Header.header_color_bg */}} <script type="text/javascript"> var azbalacSettingHeaderColor = { 'bg': '{{ $overlayBackgroundColorFallback }}', diff --git a/layouts/partials/header_fixed_top.html b/layouts/partials/header_fixed_top.html index 141cdf5..bd0d0f5 100644 --- a/layouts/partials/header_fixed_top.html +++ b/layouts/partials/header_fixed_top.html @@ -1,4 +1,13 @@ -<nav class="navbar fixed-top navbar-expand-lg {{ .Site.Params.Navbar.ColorScheme }} {{ .Site.Params.Navbar.BgScheme }}"> +{{- $navbarColorScheme := "navbar-dark" -}} +{{- if .Site.Params.Navbar.ColorScheme -}} +{{- $navbarColorScheme = .Site.Params.Navbar.ColorScheme -}} +{{- end -}} +{{- $navbarBgScheme := "bg-primary" -}} +{{- if .Site.Params.Navbar.BgScheme -}} +{{- $navbarBgScheme = .Site.Params.Navbar.BgScheme -}} +{{- end -}} + +<nav class="navbar fixed-top navbar-expand-lg {{ $navbarColorScheme }} {{ $navbarBgScheme }}"> <a class="navbar-brand" href="{{ .Site.BaseURL }}">{{ if .Site.Params.Navbar.BrandImage }}<img src="{{ .Site.BaseURL }}{{ .Site.Params.Navbar.BrandImage }}" width="30" height="30" class="d-inline-block align-top" alt=""> {{ end }}{{ .Site.Title }}</a> <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarMain" aria-controls="navbarMain" aria-expanded="false" aria-label="Toggle navigation"> |