Merge branch 'nil-fixes' of https://github.com/bep/website-2 into docsy

sarahmaddox · Nov 23, 2018 · 595354b · 595354b
2 parents c25388f + d289d5b
commit 595354b
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git a/netlify.toml b/netlify.toml
@@ -3,7 +3,7 @@
   command = "hugo"
 
 [context.deploy-preview.environment]
-  HUGO_VERSION = "0.40"
+  HUGO_VERSION = "0.51"
 
 [context.production.environment]
-  HUGO_VERSION = "0.40"
+  HUGO_VERSION = "0.51"
diff --git a/themes/docsy/layouts/partials/footer.html b/themes/docsy/layouts/partials/footer.html
@@ -3,14 +3,18 @@
   <div class="container-fluid mx-sm-5">
     <div class="row">
       <div class="col-6 col-sm-4 text-xs-center order-sm-2">
-        {{ with index $links "user"}}
+        {{ with $links }}
+        {{ with index . "user"}}
         {{ template "footer-links-block"  . }}
         {{ end }}
+        {{ end }}
       </div>
       <div class="col-6 col-sm-4 text-right text-xs-center order-sm-3">
-        {{ with index $links "developer"}}
+        {{ with $links }}
+        {{ with index . "developer"}}
         {{ template "footer-links-block"  . }}
         {{ end }}
+        {{ end }}
       </div>
       <div class="col-12 col-sm-4 text-center py-2 order-sm-2">
         {{ with .Site.Params.copyright }}<small class="text-white">&copy; {{ now.Year}} {{ .}} {{ T "footer_all_rights_reserved" }}</small>{{ end }}

diff --git a/themes/docsy/layouts/partials/navbar.html b/themes/docsy/layouts/partials/navbar.html
@@ -9,7 +9,9 @@
 			{{ range .Site.Menus.main }}
 			<li class="nav-item mr-4 mb-2 mb-lg-0">
 				{{ $active := or ($p.IsMenuCurrent "main" .) ($p.HasMenuCurrent "main" .) }}
-				{{ $active := or $active ( $.IsDescendant .Page)  }}
+				{{ with .Page }}
+				{{ $active = or $active ( $.IsDescendant .)  }}
+				{{ end }}
 				<a class="nav-link{{if $active }} active{{end}}" href="{{ with .Page }}{{ .RelPermalink }}{{ else }}{{ .URL | relLangURL }}{{ end }}"><span{{if $active }} class="active"{{end}}>{{ .Name }}</span></a>
 			</li>
 			{{ end }}