@@ -1,17 +0,0 @@ | |||
{{ define "header" }}{{ partial "page-header.html" . }}{{ end }} | |||
{{ define "main" }} | |||
<<<<<<< Updated upstream | |||
{{ $currentPageUrl := .URL }} | |||
{{ $currentSection := where .Site.Pages "Section" .Section }} | |||
<article class="center cf pv5 measure-wide-l"> | |||
<h1> | |||
This is not the page you were looking for | |||
</h1> | |||
</article> | |||
======= | |||
404 page hee | |||
{{ .Content }} | |||
>>>>>>> Stashed changes | |||
{{ end }} |
@@ -1,10 +1,10 @@ | |||
{{ define "main" }} | |||
<article class="cf pa3 pa4-m pa4-l nested-copy-line-height nested-img"> | |||
<article class="cf pa3 pa4-m pa4-l nested-copy-line-height center measure-wide-l nested-img"> | |||
<h1> | |||
{{ .Title }} | |||
</h1> | |||
<div class="{{ .Site.Params.copyClass }}"> | |||
<div class="nested-copy-line-height nested-links nested-img mid-gray "> | |||
{{ .Content }} | |||
</div> | |||
</article> |
@@ -22,7 +22,7 @@ | |||
{{ humanize .Section | upper }} | |||
</h4> | |||
<h1> | |||
{{ .Title }} | |||
{{ .Title }} | |||
</h1> | |||
<div class="nested-copy-line-height nested-links nested-img mid-gray measure-wide-l"> | |||
{{ .Content | markdownify }} |
@@ -1,6 +1,6 @@ | |||
<div class="relative flex-auto w-100 w-40-ns mr4 mb4 bg-white nested-copy-line-height"> | |||
<div class="relative flex-auto w-100 w-40-ns mr4-l mb4 bg-white nested-copy-line-height"> | |||
<div class="bg-white mb3 ph4 pv3 gray"> | |||
<div class="bg-white mb3 ph4 pv3 gray overflow-hidden"> | |||
{{ if .Date }} | |||
<date class="f6"> | |||
{{ .Date.Format "January 2, 2006" }} | |||
@@ -8,7 +8,7 @@ | |||
{{ end }} | |||
<h1 class="f3 near-black"> | |||
<a href="{{ .URL }}" class="link dim"> | |||
<a href="{{ .URL }}" class="link black dim"> | |||
{{ .Title }} | |||
</a> | |||
</h1> |
@@ -1,10 +1,10 @@ | |||
{{ define "main" }} | |||
{{ $section := where .Data.Pages "Section" "article" }} | |||
<main class="cf ph3 ph5-l pv3 pv4-l f4 tc center measure-wide lh-copy gray"> | |||
<main class="cf ph3 ph5-l pv3 pv4-l f4 tc center measure-wide-l lh-copy mid-gray"> | |||
{{ .Content }} | |||
</main> | |||
<section class="flex-ns flex-wrap justify-between w-100 mt5 v-top"> | |||
<section class="flex-ns flex-wrap justify-between w-100 mh4-l mt5 v-top"> | |||
{{ range sort $section "Date" "desc" }} | |||
{{ .Render "summary" }} | |||
{{ end }} |
@@ -1,13 +0,0 @@ | |||
<div class="relative flex-auto w-100 w-40-ns mr4 mb4 bg-white nested-copy-line-height"> | |||
<div class="bg-white mb3 ph4 pv3 gray"> | |||
{{ if .Date }} | |||
<date class="f6"> | |||
{{ .Date.Format "January 2, 2006" }} | |||
</date> | |||
{{ end }} | |||
</div> | |||
</div> |
@@ -1,16 +1,20 @@ | |||
<nav class="w-100 flex-ns justify-between items-center pv3" role="navigation"> | |||
<a href="/" class="f3 fw8 hover-white no-underline white-90 dib pv2 ph3"> | |||
{{ .Site.Title }} | |||
</a> | |||
<div> | |||
<ul> | |||
{{ range .Site.Menus.main }} | |||
<li class="list f5 f4-ns fw4 dib"> | |||
<a class="hover-white no-underline white-70 pv2 ph3" href="{{ .URL }}" > | |||
{{ .Name }} | |||
</a> | |||
</li> | |||
{{ end }} | |||
</ul> | |||
<nav class="pv3 ph3" role="navigation"> | |||
<div class="flex-ns justify-between items-center"> | |||
<a href="/" class="f3 fw8 hover-white no-underline white-90 dib"> | |||
{{ .Site.Title }} | |||
</a> | |||
{{ if .Site.Menus.main }} | |||
<ul class="pl0 mr3"> | |||
{{ range .Site.Menus.main }} | |||
<li class="list f5 f4-ns fw4 dib pr3"> | |||
<a class="hover-white no-underline white-70" href="{{ .URL }}" > | |||
{{ .Name }} | |||
</a> | |||
</li> | |||
{{ end }} | |||
</ul> | |||
{{ end }} | |||
</div> | |||
</nav> |