diff options
| author | siegerts <stephen.siegert@gmail.com> | 2019-04-05 15:50:32 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-05 15:50:32 +0300 |
| commit | 4f464969cdcdc1d697283598e75c31f723b4d032 (patch) | |
| tree | 9390baec71524840575cf71b869a0dacd7062141 | |
| parent | 99a88ebba3caceec3bc2446459ab936cc3f1b678 (diff) | |
| parent | 5bebace86b826173221d54f01c2f6bc222b0f57e (diff) | |
Merge pull request #4 from ldav1s/master
Remove twitter meta when twitter not set. Fix stray html end tag. Remove body and html end tags from footer.
| -rw-r--r-- | layouts/_default/list.html | 3 | ||||
| -rw-r--r-- | layouts/_default/single.html | 3 | ||||
| -rw-r--r-- | layouts/_default/terms.html | 3 | ||||
| -rw-r--r-- | layouts/index.html | 8 | ||||
| -rw-r--r-- | layouts/partials/footer.html | 3 | ||||
| -rw-r--r-- | layouts/partials/header.html | 11 | ||||
| -rw-r--r-- | layouts/partials/meta.html | 2 | ||||
| -rw-r--r-- | layouts/post/single.html | 3 | ||||
| -rw-r--r-- | layouts/project/single.html | 3 | ||||
| -rw-r--r-- | layouts/taxonomy/category.html | 3 | ||||
| -rw-r--r-- | layouts/taxonomy/series.html | 3 | ||||
| -rw-r--r-- | layouts/taxonomy/tag.html | 3 |
12 files changed, 30 insertions, 18 deletions
diff --git a/layouts/_default/list.html b/layouts/_default/list.html index e138ca7..38e9e55 100644 --- a/layouts/_default/list.html +++ b/layouts/_default/list.html @@ -32,4 +32,5 @@ </section> {{ partial "footer.html" . }} -</body> + </body> +</html> diff --git a/layouts/_default/single.html b/layouts/_default/single.html index 4800a03..5c7b2e5 100644 --- a/layouts/_default/single.html +++ b/layouts/_default/single.html @@ -22,4 +22,5 @@ </section> {{ partial "footer.html" . }} -</body> + </body> +</html> diff --git a/layouts/_default/terms.html b/layouts/_default/terms.html index 5feac5e..cdfc156 100644 --- a/layouts/_default/terms.html +++ b/layouts/_default/terms.html @@ -38,4 +38,5 @@ </section> {{ partial "footer.html" . }} -</body> + </body> +</html> diff --git a/layouts/index.html b/layouts/index.html index c4b8216..eb2688a 100644 --- a/layouts/index.html +++ b/layouts/index.html @@ -11,13 +11,15 @@ <title>{{ .Site.Title }}</title> <link rel="canonical" href="{{ .Permalink }}" /> +{{ $sitetitle := .Site.Title }} +{{ with .OutputFormats.Get "RSS" }} <link - href="{{ .RSSLink }}" + href="{{ .RelPermalink }}" rel="alternate" type="application/rss+xml" - title="{{ .Site.Title }}" + title="{{ $sitetitle }}" /> - +{{ end }} {{ partial "head_includes.html" . }} </head> <body diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html index b326096..ab18582 100644 --- a/layouts/partials/footer.html +++ b/layouts/partials/footer.html @@ -7,5 +7,4 @@ </footer> {{ partial "scripts.html" . }} - </body> - </html>
\ No newline at end of file + diff --git a/layouts/partials/header.html b/layouts/partials/header.html index 53e4af7..a3b5f6a 100644 --- a/layouts/partials/header.html +++ b/layouts/partials/header.html @@ -11,16 +11,17 @@ <title>{{ .Title }}</title> <link rel="canonical" href="{{ .Permalink }}" /> - +{{ $title := .Title }} +{{ with .OutputFormats.Get "RSS" }} <link - href="{{ .RSSLink }}" + href="{{ .RelPermalink }}" rel="alternate" type="application/rss+xml" - title="{{ .Title }}" + title="{{ $title }}" /> - +{{ end }} {{ partial "head_includes.html" . }} <link rel="shortcut icon" href="/favicon.ico" type="image/x-icon" /> <link rel="apple-touch-icon" href="/apple-touch-icon.png" /> </head> -</html> + diff --git a/layouts/partials/meta.html b/layouts/partials/meta.html index 0af236b..aab1c9b 100644 --- a/layouts/partials/meta.html +++ b/layouts/partials/meta.html @@ -33,6 +33,7 @@ {{ end }} {{ end }} +{{if .Site.Params.twitter }} <meta name="twitter:card" content="summary" /> <meta name="twitter:site" content="@{{ .Site.Params.twitter }}" /> <meta name="twitter:creator" content="@{{ .Site.Params.twitter }}" /> @@ -46,3 +47,4 @@ /> <meta name="twitter:image:src" content="" /> <meta name="twitter:domain" content="{{ .Permalink }}" /> +{{ end }} diff --git a/layouts/post/single.html b/layouts/post/single.html index 047b088..7a1ed38 100644 --- a/layouts/post/single.html +++ b/layouts/post/single.html @@ -58,4 +58,5 @@ </section> {{ partial "footer.html" . }} -</body> + </body> +</html> diff --git a/layouts/project/single.html b/layouts/project/single.html index 4800a03..5c7b2e5 100644 --- a/layouts/project/single.html +++ b/layouts/project/single.html @@ -22,4 +22,5 @@ </section> {{ partial "footer.html" . }} -</body> + </body> +</html> diff --git a/layouts/taxonomy/category.html b/layouts/taxonomy/category.html index 70a6fd6..e3cbb59 100644 --- a/layouts/taxonomy/category.html +++ b/layouts/taxonomy/category.html @@ -38,4 +38,5 @@ </section> {{ partial "footer.html" . }} -</body> + </body> +</html> diff --git a/layouts/taxonomy/series.html b/layouts/taxonomy/series.html index 531f9e5..c2ccd11 100644 --- a/layouts/taxonomy/series.html +++ b/layouts/taxonomy/series.html @@ -38,4 +38,5 @@ </section> {{ partial "footer.html" . }} -</body> + </body> +</html> diff --git a/layouts/taxonomy/tag.html b/layouts/taxonomy/tag.html index e34be22..a871085 100644 --- a/layouts/taxonomy/tag.html +++ b/layouts/taxonomy/tag.html @@ -38,4 +38,5 @@ </section> {{ partial "footer.html" . }} -</body> + </body> +</html> |