Fix html errors.

This commit is contained in:
Sergey Trofimov 2020-04-22 12:14:28 +02:00
parent bbf6c6513d
commit d0b426c3fa
7 changed files with 81 additions and 115 deletions

View file

@ -1,11 +1,11 @@
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
{{- partial "head.html" . -}} {{- partial "header.html" . -}}
<body> <body>
{{- partial "header.html" . -}} <div class="content">
<div id="content"> {{- partial "head.html" . -}}
{{- block "main" . }}{{- end }} {{- block "main" . }}{{- end }}
</div>
{{- partial "footer.html" . -}} {{- partial "footer.html" . -}}
</div>
</body> </body>
</html> </html>

View file

@ -1,31 +1,17 @@
<!DOCTYPE html> {{ define "main" }}
<html> {{ if isset .Data "Term" }}
{{ partial "header.html" . }} <h1>Entries tagged - "{{ .Data.Term }}"</h1>
{{ else }}
<h1 class="page-title">All articles</h1>
{{ end }}
<body> <ul class="posts">
<div class="container wrapper list"> {{- range .Data.Pages -}}
{{ partial "head.html" . }} {{- if (not (in (.Site.Params.excludedTypes | default (slice "page")) .Type)) -}}
<li class="post">
{{ if isset .Data "Term" }} <a href="{{ .RelPermalink }}">{{.Title}}</a> <span class="meta">{{ dateFormat "Jan 2, 2006" .Date }}{{ if .Draft }} <span class="draft-label">DRAFT</span> {{ end }}</span>
<h1>Entries tagged - "{{ .Data.Term }}"</h1> </li>
{{ else }} {{- end -}}
<h1 class="page-title">All articles</h1> {{- end -}}
{{ end }} </ul>
{{ 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>

View file

@ -1,22 +1,15 @@
<!DOCTYPE html> {{ define "main" }}
<html>
{{ partial "header.html" . }}
<body>
<div class="content">
{{ partial "head.html" . }}
<main> <main>
<article> <article>
<div class="title"> <div class="title">
<h1 class="title">{{ .Title }}</h1> <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 class="meta">Posted on {{ dateFormat "Jan 2, 2006" .Date }}{{ if .Draft }} <span class="draft-label">DRAFT</span> {{ end }}</div>
</div> </div>
<div> {{ if isset .Params "tldr" }}
{{ if isset .Params "tldr" }} <div class="tldr">
<div class="tldr"> <strong>tl;dr:</strong>
<strong>tl;dr:</strong> {{ .Params.tldr }}
{{ .Params.tldr }} </div>{{ end }}
</div>{{ end }}
</div>
<section class="body"> <section class="body">
{{ .Content }} {{ .Content }}
@ -24,20 +17,17 @@
<div class="post-tags"> <div class="post-tags">
{{ if ne .Type "page" }} {{ if ne .Type "page" }}
{{ if gt .Params.tags 0 }} {{ if gt .Params.tags 0 }}
<nav class="nav tags"> <nav class="nav tags">
<ul class="tags"> <ul class="tags">
{{ range .Params.tags }} {{ range .Params.tags }}
<li><a href="{{ "/tags/" | relLangURL }}{{ . | urlize }}">{{ . }}</a></li> <li><a href="{{ "/tags/" | relLangURL }}{{ . | urlize }}">{{ . }}</a></li>
{{ end }} {{ end }}
</ul> </ul>
</nav> </nav>
{{ end }} {{ end }}
{{ end }} {{ end }}
</div> </div>
</article>
</main>
{{ partial "footer.html" . }} {{ end }}
</div>
</body>
</html>

View file

@ -1,31 +1,20 @@
<!DOCTYPE html> {{ define "main" }}
<html> <h1 class="page-title">All tags</h1>
{{ partial "header.html" . }}
<body> {{ $biggest := 1 }}
<div class="container wrapper tags"> {{ $smallest := 1 }}
{{ partial "head.html" . }} {{ $max := 3 }}
{{ $min := 1 }}
{{ $size := $min }}
<h1 class="page-title">All tags</h1> {{ $data := .Data }}
<div class="tag-cloud">
{{ $biggest := 1 }} <ul class="tags">
{{ $smallest := 1 }}
{{ $max := 3 }}
{{ $min := 1 }}
{{ $size := $min }}
{{ $data := .Data }}
<div class="tag-cloud">
<ul>
{{ range $key, $value := .Data.Terms.ByCount }} {{ range $key, $value := .Data.Terms.ByCount }}
{{ $size := (add (mul (div $value.Count $biggest) (sub $max $min)) $min) }} {{ $size := (add (mul (div $value.Count $biggest) (sub $max $min)) $min) }}
{{ $size := (cond (eq $biggest $smallest) $min $size) }} {{ $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> <li><a style="font-size: {{ $size }}rem;" href="{{ $.Site.LanguagePrefix | absURL }}{{ $data.Plural }}/{{ $value.Name | urlize }}/">{{ $value.Name }}</a></li>
{{ end }} {{ end }}
</ul> </ul>
</div> </div>
{{ partial "footer.html" . }} {{ end }}
</div>
</body>
</html>

View file

@ -1,28 +1,29 @@
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
{{ partial "header.html" . }} {{ partial "header.html" . }}
<body> <body>
{{ partial "head.html" . }} <div class="content">
{{ partial "head.html" . }}
<main class="list"> <main class="list">
<div class="site-description"> <div class="site-description">
{{- if isset .Site.Params "subtitle" -}} {{- if isset .Site.Params "subtitle" -}}
<p>{{ .Site.Params.Subtitle | markdownify }}</p> <p>{{ .Site.Params.Subtitle | markdownify }}</p>
{{- end -}} {{- end -}}
</div> </div>
{{ $pages := where .Site.RegularPages "Type" "in" .Site.Params.mainSections }} {{ $pages := where .Site.RegularPages "Type" "in" .Site.Params.mainSections }}
{{ $paginator := .Paginate (where $pages "Params.hidden" "ne" true) }} {{ $paginator := .Paginate (where $pages "Params.hidden" "ne" true) }}
{{ range $paginator.Pages }} {{ range $paginator.Pages }}
<section class="list-item"> <section class="list-item">
<h1 class="title"><a href="{{ .RelPermalink }}">{{.Title}}</a></h1> <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> <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" }} {{ if isset .Params "description" }}
{{ .Description }} {{ .Description }}
{{ else }} {{ else }}
{{ .Summary }}&hellip; {{ .Summary }}&hellip;
{{ end }} {{ end }}
</span><br/> </div>
<a href="{{ .RelPermalink }}">Read more ⟶</a> <a href="{{ .RelPermalink }}">Read more ⟶</a>
</section> </section>
{{ end }} {{ end }}
@ -31,7 +32,5 @@
{{ partial "footer.html" . }} {{ partial "footer.html" . }}
</div> </div>
</div> </body>
</html>
</body>
</html>

View file

@ -8,7 +8,10 @@
{{ if not .Site.IsServer }} {{ if not .Site.IsServer }}
{{ template "_internal/google_analytics_async.html" . }} {{ template "_internal/google_analytics_async.html" . }}
{{ end }} {{ end }}
{{- if (isset .Site.Params "social") -}}
<script> <script>
feather.replace() feather.replace()
</script> </script>
{{- end }}

View file

@ -1,11 +1,10 @@
<div class="content">
<header> <header>
<div class="main"> <div class="main">
<a href="{{ .Site.BaseURL }}">{{ .Site.Title }}</a> <a href="{{ .Site.BaseURL }}">{{ .Site.Title }}</a>
</div> </div>
<nav> <nav>
{{ range .Site.Menus.main }} {{ range .Site.Menus.main }}
<a href="{{ .URL }}">{{ .Name }}</a> <a href="{{ .URL }}">{{ .Name }}</a>
{{ end }} {{ end }}
</nav> </nav>
</header> </header>