diff options
| author | Athul Cyriac Ajay <athul8720@gmail.com> | 2020-04-26 17:39:49 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-26 17:39:49 +0300 |
| commit | 5cdcf6d3b12339385092f8da2264669bbe1c400b (patch) | |
| tree | 99fbe5583fd3080c710ad506c628971723650362 | |
| parent | bbf6c6513d2ddb24a24f8bc64d2946ce08277bf4 (diff) | |
| parent | d0b426c3fa6acdc8cdb4a42d23b59544ee3b4691 (diff) | |
Merge pull request #3 from sarg/iss-1
Fix html errors.
| -rw-r--r-- | layouts/_default/baseof.html | 8 | ||||
| -rw-r--r-- | layouts/_default/list.html | 46 | ||||
| -rw-r--r-- | layouts/_default/single.html | 48 | ||||
| -rw-r--r-- | layouts/_default/terms.html | 43 | ||||
| -rw-r--r-- | layouts/index.html | 29 | ||||
| -rw-r--r-- | layouts/partials/footer.html | 3 | ||||
| -rw-r--r-- | layouts/partials/head.html | 19 |
7 files changed, 81 insertions, 115 deletions
diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html index 5f8e2ec..b941097 100644 --- a/layouts/_default/baseof.html +++ b/layouts/_default/baseof.html @@ -1,11 +1,11 @@ <!DOCTYPE html> <html> - {{- partial "head.html" . -}} + {{- partial "header.html" . -}} <body> - {{- partial "header.html" . -}} - <div id="content"> + <div class="content"> + {{- partial "head.html" . -}} {{- block "main" . }}{{- end }} - </div> {{- partial "footer.html" . -}} + </div> </body> </html> diff --git a/layouts/_default/list.html b/layouts/_default/list.html index 32f5e0b..41a4c6f 100644 --- a/layouts/_default/list.html +++ b/layouts/_default/list.html @@ -1,31 +1,17 @@ -<!DOCTYPE html> -<html> -{{ partial "header.html" . }} +{{ define "main" }} +{{ if isset .Data "Term" }} +<h1>Entries tagged - "{{ .Data.Term }}"</h1> +{{ else }} +<h1 class="page-title">All articles</h1> +{{ end }} -<body> - <div class="container wrapper list"> - {{ partial "head.html" . }} - - {{ if isset .Data "Term" }} - <h1>Entries tagged - "{{ .Data.Term }}"</h1> - {{ else }} - <h1 class="page-title">All articles</h1> - {{ end }} - - <ul class="posts"> - {{- range .Data.Pages -}} - {{- if (in (.Site.Params.excludedTypes | default (slice "page")) .Type) -}} - {{- else -}} - <li class="post"> - <a href="{{ .RelPermalink }}">{{.Title}}</a> <span class="meta">{{ dateFormat "Jan 2, 2006" .Date }}{{ if .Draft }} <span class="draft-label">DRAFT</span> {{ end }}</span> - </li> - {{- end -}} - {{- end -}} - </ul> - {{ partial "footer.html" . }} - </div> - - -</body> - -</html> +<ul class="posts"> + {{- range .Data.Pages -}} + {{- if (not (in (.Site.Params.excludedTypes | default (slice "page")) .Type)) -}} + <li class="post"> + <a href="{{ .RelPermalink }}">{{.Title}}</a> <span class="meta">{{ dateFormat "Jan 2, 2006" .Date }}{{ if .Draft }} <span class="draft-label">DRAFT</span> {{ end }}</span> + </li> + {{- end -}} + {{- end -}} +</ul> +{{ end }} diff --git a/layouts/_default/single.html b/layouts/_default/single.html index cfdb8fc..e072801 100644 --- a/layouts/_default/single.html +++ b/layouts/_default/single.html @@ -1,22 +1,15 @@ -<!DOCTYPE html> -<html> -{{ partial "header.html" . }} -<body> - <div class="content"> - {{ partial "head.html" . }} +{{ define "main" }} <main> -<article> + <article> <div class="title"> <h1 class="title">{{ .Title }}</h1> <div class="meta">Posted on {{ dateFormat "Jan 2, 2006" .Date }}{{ if .Draft }} <span class="draft-label">DRAFT</span> {{ end }}</div> </div> - <div> - {{ if isset .Params "tldr" }} - <div class="tldr"> - <strong>tl;dr:</strong> - {{ .Params.tldr }} - </div>{{ end }} - </div> + {{ if isset .Params "tldr" }} + <div class="tldr"> + <strong>tl;dr:</strong> + {{ .Params.tldr }} + </div>{{ end }} <section class="body"> {{ .Content }} @@ -24,20 +17,17 @@ <div class="post-tags"> {{ if ne .Type "page" }} - {{ if gt .Params.tags 0 }} - <nav class="nav tags"> - <ul class="tags"> - {{ range .Params.tags }} - <li><a href="{{ "/tags/" | relLangURL }}{{ . | urlize }}">{{ . }}</a></li> - {{ end }} - </ul> - </nav> - {{ end }} + {{ if gt .Params.tags 0 }} + <nav class="nav tags"> + <ul class="tags"> + {{ range .Params.tags }} + <li><a href="{{ "/tags/" | relLangURL }}{{ . | urlize }}">{{ . }}</a></li> + {{ end }} + </ul> + </nav> + {{ end }} {{ end }} </div> - - - {{ partial "footer.html" . }} - </div> -</body> -</html> + </article> +</main> +{{ end }} diff --git a/layouts/_default/terms.html b/layouts/_default/terms.html index cec21f6..fea9c2f 100644 --- a/layouts/_default/terms.html +++ b/layouts/_default/terms.html @@ -1,31 +1,20 @@ -<!DOCTYPE html> -<html> -{{ partial "header.html" . }} +{{ define "main" }} +<h1 class="page-title">All tags</h1> -<body> - <div class="container wrapper tags"> - {{ partial "head.html" . }} +{{ $biggest := 1 }} +{{ $smallest := 1 }} +{{ $max := 3 }} +{{ $min := 1 }} +{{ $size := $min }} - <h1 class="page-title">All tags</h1> - - {{ $biggest := 1 }} - {{ $smallest := 1 }} - {{ $max := 3 }} - {{ $min := 1 }} - {{ $size := $min }} - - {{ $data := .Data }} - <div class="tag-cloud"> - <ul> +{{ $data := .Data }} +<div class="tag-cloud"> + <ul class="tags"> {{ range $key, $value := .Data.Terms.ByCount }} - {{ $size := (add (mul (div $value.Count $biggest) (sub $max $min)) $min) }} - {{ $size := (cond (eq $biggest $smallest) $min $size) }} - <li><a style="font-size: {{ $size }}rem;" href="{{ $.Site.LanguagePrefix | absURL }}{{ $data.Plural }}/{{ $value.Name | urlize }}/">{{ $value.Name }}</a></li> + {{ $size := (add (mul (div $value.Count $biggest) (sub $max $min)) $min) }} + {{ $size := (cond (eq $biggest $smallest) $min $size) }} + <li><a style="font-size: {{ $size }}rem;" href="{{ $.Site.LanguagePrefix | absURL }}{{ $data.Plural }}/{{ $value.Name | urlize }}/">{{ $value.Name }}</a></li> {{ end }} - </ul> - </div> - {{ partial "footer.html" . }} - </div> -</body> - -</html> + </ul> +</div> +{{ end }} diff --git a/layouts/index.html b/layouts/index.html index 29443fe..77490de 100644 --- a/layouts/index.html +++ b/layouts/index.html @@ -1,28 +1,29 @@ <!DOCTYPE html> <html> -{{ partial "header.html" . }} -<body> - {{ partial "head.html" . }} - + {{ partial "header.html" . }} + <body> + <div class="content"> + {{ partial "head.html" . }} + <main class="list"> - <div class="site-description"> - {{- if isset .Site.Params "subtitle" -}} - <p>{{ .Site.Params.Subtitle | markdownify }}</p> - {{- end -}} - </div> + <div class="site-description"> + {{- if isset .Site.Params "subtitle" -}} + <p>{{ .Site.Params.Subtitle | markdownify }}</p> + {{- end -}} + </div> {{ $pages := where .Site.RegularPages "Type" "in" .Site.Params.mainSections }} {{ $paginator := .Paginate (where $pages "Params.hidden" "ne" true) }} {{ range $paginator.Pages }} <section class="list-item"> <h1 class="title"><a href="{{ .RelPermalink }}">{{.Title}}</a></h1> <time>{{ dateFormat "Jan 2, 2006" .Date }}{{ if .Draft }} <span class="draft-label">DRAFT</span> {{ end }}</time> - <br><span class="description"> + <br><div class="description"> {{ if isset .Params "description" }} {{ .Description }} {{ else }} {{ .Summary }}… {{ end }} - </span><br/> + </div> <a href="{{ .RelPermalink }}">Read more ⟶</a> </section> {{ end }} @@ -31,7 +32,5 @@ {{ partial "footer.html" . }} </div> - </div> - -</body> -</html>
\ No newline at end of file + </body> +</html> diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html index 9b006d1..a209a00 100644 --- a/layouts/partials/footer.html +++ b/layouts/partials/footer.html @@ -8,7 +8,10 @@ {{ if not .Site.IsServer }} {{ template "_internal/google_analytics_async.html" . }} {{ end }} + +{{- if (isset .Site.Params "social") -}} <script> feather.replace() </script> +{{- end }} diff --git a/layouts/partials/head.html b/layouts/partials/head.html index 00c79da..ab3f39d 100644 --- a/layouts/partials/head.html +++ b/layouts/partials/head.html @@ -1,11 +1,10 @@ -<div class="content"> <header> -<div class="main"> - <a href="{{ .Site.BaseURL }}">{{ .Site.Title }}</a> -</div> -<nav> - {{ range .Site.Menus.main }} - <a href="{{ .URL }}">{{ .Name }}</a> - {{ end }} -</nav> -</header>
\ No newline at end of file + <div class="main"> + <a href="{{ .Site.BaseURL }}">{{ .Site.Title }}</a> + </div> + <nav> + {{ range .Site.Menus.main }} + <a href="{{ .URL }}">{{ .Name }}</a> + {{ end }} + </nav> +</header> |