diff options
author | Matthew <matthew.rhone@outlook.com> | 2018-08-18 22:05:36 +0300 |
---|---|---|
committer | Matthew <matthew.rhone@outlook.com> | 2018-08-18 22:05:36 +0300 |
commit | d8fec9a1f207aee682e8efe9bbd10916cf318252 (patch) | |
tree | aa20ea4b6d633252cb6e77e12ae249adfd6663ae /layouts | |
parent | 688b876261d27cfcfd1af165bbc59a28bdb5b5ca (diff) |
Removed lost grid, start reworking without grid, adding new HTML5 content, html cleanup.
Diffstat (limited to 'layouts')
-rw-r--r-- | layouts/_default/list.html | 23 | ||||
-rw-r--r-- | layouts/_default/single.html | 7 | ||||
-rw-r--r-- | layouts/index.html | 20 | ||||
-rw-r--r-- | layouts/partials/footer.html | 9 | ||||
-rw-r--r-- | layouts/partials/header.html | 26 |
5 files changed, 48 insertions, 37 deletions
diff --git a/layouts/_default/list.html b/layouts/_default/list.html index b285b02..793d303 100644 --- a/layouts/_default/list.html +++ b/layouts/_default/list.html @@ -1,11 +1,16 @@ {{ partial "header.html" . }} {{ $paginator := .Paginate ( where .Data.Pages "Type" "in" (or "posts" "post")) 5 }} -{{ range $paginator.Pages }}<div class="empty"> </div> - <div class="post-title"> - <a class="post-title-link" href="{{ .Permalink }}">{{ .Title }}</a> - </div>{{ if isset .Params "tags" }} - <div class="tags">tags:</br> - {{ range .Params.tags }}<a class="tag-link" href="{{ "/tags/" | relLangURL }}{{ . | urlize }}">{{ . }} </a>{{ end }} - </div> - <div class="content-tags"><p>{{.Summary}}</p></div>{{ else }} - <div class="content-full"><p>{{.Summary}}</p></div> {{ end }}{{ end }}{{ partial "pagination.html" . }}{{ partial "footer.html" . }} +{{ range $paginator.Pages }} +<section> + <h3><a class="post-title-link" href="{{ .Permalink }}">{{ .Title }}</a></h3> + {{ if isset .Params "tags" }} + <div class="tags">tags: + {{ range .Params.tags }} + <a class="tag-link" href="{{ "/tags/" | relLangURL }}{{ . | urlize }}">{{ . }} </a> + {{ end }} + </div> + {{ end }} + <div class="content"><p>{{.Summary}}</p></div> +</section> +{{ end }} + {{ partial "pagination.html" . }}{{ partial "footer.html" . }} diff --git a/layouts/_default/single.html b/layouts/_default/single.html index 341cd94..cab14b0 100644 --- a/layouts/_default/single.html +++ b/layouts/_default/single.html @@ -1,9 +1,8 @@ {{ partial "header.html" . }} <article itemscope itemtype="http://schema.org/Blog"> - <div class="post-title"> - <a class="post-title-link" href="{{ .Permalink }}" itemprop="name">{{ .Title }}</a> - </div>{{ if isset .Params "tags" }} - <div class="tags">tags:</br> + <h3><a class="post-title-link" href="{{ .Permalink }}">{{ .Title }}</a></h3> + {{ if isset .Params "tags" }} + <div class="tags">tags: <span itemprop="keywords">{{ range .Params.tags }}<a class="tag-link" href="{{ "/tags/" | relLangURL }}{{ . | urlize }}" rel="tag">{{ . }} </a>{{ end }} </span> </div>{{ end }} diff --git a/layouts/index.html b/layouts/index.html index b7e619a..65959a0 100644 --- a/layouts/index.html +++ b/layouts/index.html @@ -1,15 +1,17 @@ {{ partial "header.html" . }} {{ $paginator := .Paginate ( where .Data.Pages "Type" "in" (or "posts" "post")) 5 }} {{ range $paginator.Pages }} - <div class="post-title"> - <a class="post-title-link" href="{{ .Permalink }}">{{ .Title }}</a> - </div> - {{ if isset .Params "tags" }} - <div class="tags">tags:</br> - {{ range .Params.tags }}<a class="tag-link" href="{{ "/tags/" | relLangURL }}{{ . | urlize }}" rel="tag">{{ . }} </a> - {{ end }}</div> - <div class="content-tags"><p>{{.Summary}}</p></div>{{ else }} - <div class="content-full"><p>{{.Summary}}</p></div> {{ end }} +<section> + <h3><a class="post-title-link" href="{{ .Permalink }}">{{ .Title }}</a></h3> + {{ if isset .Params "tags" }} + <div class="tags">tags: + {{ range .Params.tags }} + <a class="tag-link" href="{{ "/tags/" | relLangURL }}{{ . | urlize }}" rel="tag">{{ . }} </a> + {{ end }} + </div> {{ end }} + <div class="content"><p>{{.Summary}}</p></div> +</section> +{{ end }} {{ partial "pagination.html" . }} {{ partial "footer.html" . }} diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html index 7c9ce0d..2dbd76a 100644 --- a/layouts/partials/footer.html +++ b/layouts/partials/footer.html @@ -1,6 +1,7 @@ - <div class="copyright"><p>{{ with .Site.Copyright | safeHTML }}{{.}}{{ else }}© {{ now.Format "2006"}}. {{ .Site.Title }}. All rights reserved. {{end}} - </p> - </div> {{ partial "google_analytics.html" . }} -</div> + <footer> + <div class="copyright"><p>{{ with .Site.Copyright | safeHTML }}{{.}}{{ else }}© {{ now.Format "2006"}}. {{ .Site.Title }}. All rights reserved. {{end}} + </p> + </div> {{ partial "google_analytics.html" . }} + </footer> </body> </html> diff --git a/layouts/partials/header.html b/layouts/partials/header.html index 68ac3ad..4ed77f2 100644 --- a/layouts/partials/header.html +++ b/layouts/partials/header.html @@ -16,14 +16,18 @@ </head> <body> - <div class="wrap"> - <div class="navbar"> - <ul class="navbar-list"> - {{ range .Site.Menus.top }} - <li class="navbar-item"><a class="navbar-link" href="{{ .URL }}">{{ .Name }}</a></li>{{ end }} - </ul> - </div> - <div class="header"> - <a href="{{ .Site.BaseURL }}" class="title">{{ .Site.Title }}</a> - {{ if .Site.Params.description }}<span class="title-description"> | <i>{{ .Site.Params.description }}</i> </span>{{end}} - </div> + <header> + <nav> + <ul class="navbar-list"> + {{ range .Site.Menus.top }} + <li class="navbar-item"><a class="navbar-link" href="{{ .URL }}">{{ .Name }}</a></li>{{ end }} + </ul> + </nav> + <br /> + <h1><a href="{{ .Site.BaseURL }}" class="title">{{ .Site.Title }}</a> + {{ if .Site.Params.description }} + <span class="title-description"> | <i>{{ .Site.Params.description }}</i> + </span> + {{end}} + </h1> + </header> |