From c85bcf8488754677329a4b2b556eb51e11959af0 Mon Sep 17 00:00:00 2001 From: alex bezek Date: Thu, 22 Oct 2020 12:08:11 -0400 Subject: [PATCH 1/7] Add document data and aria attributes to collapse the nav bar in mobile when an item is clicked (#112) --- layouts/partials/navigators/navbar.html | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/layouts/partials/navigators/navbar.html b/layouts/partials/navigators/navbar.html index e947bf8..26b7848 100644 --- a/layouts/partials/navigators/navbar.html +++ b/layouts/partials/navigators/navbar.html @@ -31,7 +31,16 @@ {{ end }} - {{ if .Site.Params.newsletter.enable }} + {{ if site.Params.newsletter.enable }}

{{ i18n "newsletter_text" }}

diff --git a/layouts/partials/header.html b/layouts/partials/header.html index 5d9e40f..a1f34dc 100644 --- a/layouts/partials/header.html +++ b/layouts/partials/header.html @@ -13,7 +13,7 @@ - + diff --git a/layouts/partials/helpers/get-author-image.html b/layouts/partials/helpers/get-author-image.html index 9ab6360..8142ddc 100644 --- a/layouts/partials/helpers/get-author-image.html +++ b/layouts/partials/helpers/get-author-image.html @@ -1,7 +1,12 @@ -{{ $authorImage:= "/assets/images/default-avatar.png"}} -{{ if .Site.Data.site.author}} - {{ $authorImage = .Site.Data.site.author.image | relURL }} -{{ end}} +{{ $author:= site.Data.author }} +{{ if (index site.Data site.Language.Lang).author }} + {{ $author = (index site.Data site.Language.Lang).author }} +{{ end }} +{{ $authorImage:= "/assets/images/default-avatar.png" }} +{{ if $author.image }} + {{ $authorImage = $author.image }} +{{ end }} + {{ if eq (printf "%T" .Params.author ) "maps.Params" }} {{ with .Params.author }} {{ if .image }} diff --git a/layouts/partials/helpers/get-author-name.html b/layouts/partials/helpers/get-author-name.html index 1ad3612..63c0846 100644 --- a/layouts/partials/helpers/get-author-name.html +++ b/layouts/partials/helpers/get-author-name.html @@ -1,6 +1,6 @@ -{{ $authorName:= .Site.Params.author.name }} -{{ if .Site.Data.site.author}} - {{ $authorName = .Site.Data.site.author.name }} +{{ $authorName:= site.Params.author.name }} +{{ if site.Data.site.author}} + {{ $authorName = site.Data.site.author.name }} {{ end}} {{ if eq (printf "%T" .Params.author ) "maps.Params" }} {{ with .Params.author }} diff --git a/layouts/partials/navigators/floating-lang-selector.html b/layouts/partials/navigators/floating-lang-selector.html index 6c59479..ec891d6 100644 --- a/layouts/partials/navigators/floating-lang-selector.html +++ b/layouts/partials/navigators/floating-lang-selector.html @@ -1,12 +1,12 @@ {{ $pageURL:= .RelPermalink }} -{{ if .Site.IsMultiLingual }} +{{ if site.IsMultiLingual }} {{ $pageURL = strings.TrimPrefix (path.Join "/" .Language.Lang) $pageURL }} {{ end }}
{{ range .Translations }} diff --git a/layouts/partials/navigators/lang-selector-2.html b/layouts/partials/navigators/lang-selector-2.html index a900573..d94bd05 100644 --- a/layouts/partials/navigators/lang-selector-2.html +++ b/layouts/partials/navigators/lang-selector-2.html @@ -1,12 +1,12 @@ {{ $pageURL:= .RelPermalink }} -{{ if .Site.IsMultiLingual }} +{{ if site.IsMultiLingual }} {{ $pageURL = strings.TrimPrefix (path.Join "/" .Language.Lang) $pageURL }} {{ end }}
  • {{ range .Translations }} diff --git a/layouts/partials/navigators/lang-selector.html b/layouts/partials/navigators/lang-selector.html index 0c73196..395cbb1 100644 --- a/layouts/partials/navigators/lang-selector.html +++ b/layouts/partials/navigators/lang-selector.html @@ -1,10 +1,10 @@
  • - {{ range $.Site.Home.AllTranslations }} + {{ range site.Home.AllTranslations }} {{ .Language.LanguageName }} diff --git a/layouts/partials/navigators/navbar-2.html b/layouts/partials/navigators/navbar-2.html index 7bb845b..e057e21 100644 --- a/layouts/partials/navigators/navbar-2.html +++ b/layouts/partials/navigators/navbar-2.html @@ -1,5 +1,5 @@ -{{ $mainLogo:="assets/images/main-logo.png" }} -{{ $invertedLogo:="assets/images/inverted-logo.png" }} +{{ $mainLogo:="/assets/images/main-logo.png" }} +{{ $invertedLogo:="/assets/images/inverted-logo.png" }} {{ if site.Params.logo.main }} {{ $mainLogo = site.Params.logo.main }} {{ end }} @@ -13,7 +13,7 @@ - + {{- site.Title -}}
    • - - + + diff --git a/layouts/partials/navigators/navbar.html b/layouts/partials/navigators/navbar.html index 26b7848..03f68c0 100644 --- a/layouts/partials/navigators/navbar.html +++ b/layouts/partials/navigators/navbar.html @@ -1,22 +1,22 @@ -{{ $mainLogo:="assets/images/main-logo.png" }} -{{ $invertedLogo:="assets/images/inverted-logo.png" }} -{{ if .Site.Params.logo.main }} - {{ $mainLogo = .Site.Params.logo.main }} +{{ $mainLogo:="/assets/images/main-logo.png" }} +{{ $invertedLogo:="/assets/images/inverted-logo.png" }} +{{ if site.Params.logo.main }} + {{ $mainLogo = site.Params.logo.main }} {{ end }} -{{ if .Site.Params.logo.inverted }} - {{ $invertedLogo = .Site.Params.logo.inverted }} +{{ if site.Params.logo.inverted }} + {{ $invertedLogo = site.Params.logo.inverted }} {{ end }} -{{ $sections:= .Site.Data.sections }} -{{ if (index .Site.Data .Site.Language.Lang).sections }} - {{ $sections = (index .Site.Data .Site.Language.Lang).sections }} +{{ $sections:= site.Data.sections }} +{{ if (index site.Data site.Language.Lang).sections }} + {{ $sections = (index site.Data site.Language.Lang).sections }} {{ end }}
    - - + + diff --git a/layouts/partials/sections/about.html b/layouts/partials/sections/about.html index 914fea0..df9702d 100644 --- a/layouts/partials/sections/about.html +++ b/layouts/partials/sections/about.html @@ -38,7 +38,7 @@
    {{ if .resume }} - {{ end }} diff --git a/layouts/partials/sections/achievements/entry.html b/layouts/partials/sections/achievements/entry.html index 51621f0..4f665ce 100644 --- a/layouts/partials/sections/achievements/entry.html +++ b/layouts/partials/sections/achievements/entry.html @@ -1,6 +1,6 @@

    {{ .title }}

    diff --git a/layouts/partials/sections/home.html b/layouts/partials/sections/home.html index 76715f7..4bf85e2 100644 --- a/layouts/partials/sections/home.html +++ b/layouts/partials/sections/home.html @@ -1,6 +1,6 @@ -{{ $author:= .Site.Data.author }} -{{ if (index .Site.Data .Site.Language.Lang).author }} - {{ $author = (index .Site.Data .Site.Language.Lang).author }} +{{ $author:= site.Data.author }} +{{ if (index site.Data site.Language.Lang).author }} + {{ $author = (index site.Data site.Language.Lang).author }} {{ end }} {{ $name:="Jane Doe" }} @@ -10,17 +10,17 @@ {{ $name = $author.name }} {{ end }} -{{ $sections:= .Site.Data.sections }} -{{ if (index .Site.Data .Site.Language.Lang).sections }} - {{ $sections = (index .Site.Data .Site.Language.Lang).sections }} +{{ $sections:= site.Data.sections }} +{{ if (index site.Data site.Language.Lang).sections }} + {{ $sections = (index site.Data site.Language.Lang).sections }} {{ end }} -{{ $backgroundImage:= "assets/images/default-background.jpg" }} -{{ if .Site.Params.background }} - {{ $backgroundImage = .Site.Params.background }} +{{ $backgroundImage:= "/assets/images/default-background.jpg" }} +{{ if site.Params.background }} + {{ $backgroundImage = site.Params.background }} {{ end }} -{{ $authorImage:= "assets/images/default-avatar.png" }} +{{ $authorImage:= "/assets/images/default-avatar.png" }} {{ if $author.image }} {{ $authorImage = $author.image }} {{ end }} @@ -28,10 +28,10 @@
    -

    {{ $author.greeting }} {{ $name }}