diff options
Diffstat (limited to 'layouts/_default')
| -rw-r--r-- | layouts/_default/archive.terms.html | 21 | ||||
| -rw-r--r-- | layouts/_default/baseof.html | 9 | ||||
| -rw-r--r-- | layouts/_default/list.html | 14 | ||||
| -rw-r--r-- | layouts/_default/search.html | 30 | ||||
| -rw-r--r-- | layouts/_default/single.html | 93 | ||||
| -rw-r--r-- | layouts/_default/summary.html | 25 | ||||
| -rw-r--r-- | layouts/_default/terms.html | 19 |
7 files changed, 42 insertions, 169 deletions
diff --git a/layouts/_default/archive.terms.html b/layouts/_default/archive.terms.html deleted file mode 100644 index 7b5a540..0000000 --- a/layouts/_default/archive.terms.html +++ /dev/null @@ -1,21 +0,0 @@ -{{ define "main" }} -<div id="content" class="bg-near-white pa2 pt5"> - {{ range (where .Site.RegularPages "Section" "post").GroupByDate "2006" }} - <section class="f4 bb b--black-40 mw7 center"> - <h4 class="">{{ .Key }}</h4> - - {{ range .Pages.GroupByDate "January" }} - <ul class="list mv1"> - <li class="b">{{ .Key }}</li> - - <ul class="pv2"> - {{ range .Pages }} - <li class="black-50"><a href="{{ .Permalink }}" class="f4 dark-gray underline-hover">{{.Title}}</a> - {{ .Date.Format "Jan 2" }}</li> - {{ end}} - </ul> - </ul> - {{ end}} - </section> - {{ end }} -</div> -{{ end }} diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html index f5fb3d8..20e0c0c 100644 --- a/layouts/_default/baseof.html +++ b/layouts/_default/baseof.html @@ -1,16 +1,11 @@ <!DOCTYPE html> <html> {{- partial "head.html" . -}} - <body class="bg-near-white sans-serif" - style="background:url('{{ .Site.Params.coverImage | absURL }}') fixed;"> + <body class="w3-theme-dark"> {{- partial "header.html" . -}} - - <div id="content" class="fl w-75-ns bg-black-10"> + <div id="content" class="min-vh-100"> {{- block "main" . }}{{- end }} </div> - {{- partial "footer.html" . -}} - - {{- block "footerfiles" . }}{{- end }} </body> </html> diff --git a/layouts/_default/list.html b/layouts/_default/list.html index c9839f8..a1f0f08 100644 --- a/layouts/_default/list.html +++ b/layouts/_default/list.html @@ -1,8 +1,10 @@ {{ define "main" }} -<section class="bg-near-white pb2 pt4"> - {{ range .Paginator.Pages }} - {{ .Render "summary" }} - {{ end }} - {{ partial "pagination.html" . }} -</section> +{{ partial "open_section.html" . }} + +{{ range .Paginator.Pages.ByPublishDate.Reverse }} +<div class="stripe-dark"> + {{ partial "post.html" . }} +</div> +{{ end }} +{{ partial "pagination.html" . }} {{ end }} diff --git a/layouts/_default/search.html b/layouts/_default/search.html deleted file mode 100644 index 4bf77f2..0000000 --- a/layouts/_default/search.html +++ /dev/null @@ -1,30 +0,0 @@ -{{ define "footerfiles" }} -<script src="https://code.jquery.com/jquery-3.3.1.min.js"></script> -<script src="https://cdnjs.cloudflare.com/ajax/libs/fuse.js/3.2.1/fuse.min.js"></script> -<script src="https://cdnjs.cloudflare.com/ajax/libs/mark.js/8.11.1/jquery.mark.min.js"></script> -<script src="{{ "js/search.js" | absURL }}"></script> -{{ end }} - -{{ define "main" }} -<section class="bg-near-white pt5"> - <div class="mw7 center pv4" > - <form action="{{ .Permalink }}"> - <input id="search-query" name="s"/> - </form> - <div id="search-results"> - <h3>Matching pages</h3> - </div> - </div> -</section> -<!-- this template is sucked in by search.js and appended to the search-results div above. So editing here will adjust style --> -<script id="search-result-template" type="text/x-js-template"> - <div id="summary-${key}" class="bt bb b--black-10 ph4"> - <h4><a href="${link}">${title}</a></h4> - <p>${snippet}…</p> - - - ${ isset tags }<p><i class="fa fa-tags"></i> Tags: ${tags}</p>${ end } - ${ isset categories }<p><i class="fa fa-bookmark"></i> Categories: ${categories}</p>${ end } - </div> -</script> -{{ end }} diff --git a/layouts/_default/single.html b/layouts/_default/single.html index 6007308..3d75915 100644 --- a/layouts/_default/single.html +++ b/layouts/_default/single.html @@ -1,71 +1,42 @@ {{ define "main" }} -<article> - <div id="post-header-cover" class="bg-center cover bg-black-30" - {{ with .Params.cover }} - style="background-image:url({{ . }})" - {{ end }} > - <header class="dt pa2 mw6 center post-header white"> - <h1 class="f1 lh-title"> - {{ .Title }}</h1> - - {{ if not (eq .Params.showMeta false) }} - <div class="f4 tracked mb3">{{ .Date.Format "Mon, Jan 2, 2006" }}</div> - {{ partial "meta.html" . }} +<article class="mw7 center ph2"> + <header> + <h2 class="baskerville f2 lh-title mv3"> + {{ .Title }} + </h2> + + {{ with .Params.subtitle }} + <h3 class="f3 baskerville mv3">{{ . }}</h3> + {{end}} + + {{ if isset .Params "image" }} + {{ $image := resources.Get .Params.image }} + {{ $image := $image.Fill (default "400x400" .Params.image_size) }} + <div class="relative"> + <img src="{{ $image.RelPermalink }}" class="db center" alt= "{{ .Title }}"> + {{ with .Params.caption }} + <a href="{{ .url }}" class="link near-white absolute bottom-0 right-0 pa2 bg-black-30 br2"> + {{ .text }} + </a> {{ end }} - </header> - </div> - - <div id="content" class="bg-near-white"> - <div class="mw7 center lh-copy pv4 ph2 black-70"> - {{ .Content }} </div> + {{end}} - <footer class="mw7 center ph3 pb2 bt bb cf b--black-50"> - {{ with .Params.tags }} - <div class="fl-ns w-50-ns mb2"> - - <h5 class="f5 ttu black-60"><i class="fa fa-lg fa-tags"></i> Tagged in</h5> - {{ range . }} - <a class="f5 link br1 ph3 pv2 blue dib hover-bg-light-blue hover-white ba" - href="{{ $.Site.LanguagePrefix }}/tags/{{ . | urlize }}/">{{ . }}</a> - {{ end }} - </div> - {{ end }} - - <div class="fl-ns w-50-ns mb2"> - <h5 class="f5 ttu black-60"><i class="fa fa-lg fa-share-alt"></i> Share in Social Networks</h5> - {{ range .Site.Params.sharingOptions }} - <a class="f4 link br1 ph3 pv2 blue dib hover-bg-light-blue hover-white ba" target="new" href="{{ printf .url $.Permalink }}"> - <i class="fa {{ .icon }}"></i> - </a> - {{ end }} - </div> - </footer> + {{ if isset .Params "metadata" }} + {{ partial "metadata.html" . }} + {{ end }} - <!-- Pagination Actions for posts --> - {{ if not (eq .Params.showActions false) }} - <div class="mv3 tc"> - {{ with .NextInSection }} - <a href="{{ .RelPermalink }}" class="dib f4 link br1 ma1 pa2 blue hover-bg-light-blue hover-white ba"> - <i class="fa fa-angle-left"></i> Newer <br/> - {{ .Title }} - </a> - {{ end}} - {{ with .PrevInSection }} - <a href="{{ .RelPermalink }}" class="dib f4 link br1 ma1 pa2 blue hover-bg-light-blue hover-white ba"> - Older <i class="fa fa-angle-right"></i> <br/> - {{ .Title }} - </a> - {{ end}} - </div> - {{ end}} + </header> - {{ if not (eq .Params.comments false) }} - <div class="mw7 center mv4 pa2"> - {{ template "_internal/disqus.html" . }} - </div> - {{ end }} + <div class="main-content sans-serif f5 f4-ns lh-copy baskerville"> +{{ .Content }} </div> </article> +<div class="sans-serif f5 f4-ns lh-copy pv2"> +{{ if isset .Params "metadata" }} +{{ partial "author_card" . }} +{{ end }} +{{ partial "post_pager" . }} +</div> {{ end }} diff --git a/layouts/_default/summary.html b/layouts/_default/summary.html deleted file mode 100644 index 20c8d9c..0000000 --- a/layouts/_default/summary.html +++ /dev/null @@ -1,25 +0,0 @@ -<article class="ba br2 b--black-10 mw7 mh3-ns mv3 bg-near-white"> - <a href='{{ .Permalink }}' class="db pa4-ns pa2 black no-underline dim "> - <header> - <h1 class="f2 lh-title black-90"> - {{ .Title }} - </h1> - <div class="gray">{{ .Date.Format "Mon, Jan 2, 2006" }} - {{ .FuzzyWordCount }} Words - {{ .ReadingTime }} min read</div> - </header> - <p class="f4 lh-copy black-80"> - {{ .Summary }} - </p> - <footer> - - <nobr class="link">Continue reading →</nobr> - {{ with .Params.thumbnailImage }} - <img src="{{ . }}" class="mt2 br2 grow"> - {{ else }} - {{ if .Params.cover }} - <img src="{{ .Params.cover }}" class="mt2 br2 grow" /> - {{ end}} - {{ end }} - - </footer> - </a> -</article> diff --git a/layouts/_default/terms.html b/layouts/_default/terms.html deleted file mode 100644 index 42d5541..0000000 --- a/layouts/_default/terms.html +++ /dev/null @@ -1,19 +0,0 @@ -{{ define "main" }} -<div id="content" class="bg-near-white pa2 pt5"> - <section class="mw7 center"> - {{ range .Data.Terms.ByCount }} - <h4 class="f4"> - <a href="{{ .Name }}" class="dark-gray underline-hover"> - {{ .Name }} ({{ .Pages | len }}) - </a> - </h4> - - <ul class="bb b--black-50 pb2"> - {{ range .Pages.ByDate.Reverse }} - <li class="black-50"><a href="{{ .Permalink }}" class="f4 dark-gray underline-hover">{{.Title}}</a> - {{ .Date.Format "Jan 2, 2006" }}</li> - {{ end}} - </ul> - {{ end }} - </section> -</div> -{{ end }} |