Merge pull request #8 from wlsc/master

MINOR: improvements to meta partial
This commit is contained in:
Carson Ip
2017-05-15 13:35:03 +02:00
committed by GitHub
3 changed files with 16 additions and 19 deletions

View File

@@ -1,10 +1,9 @@
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
<head> <head>
<meta charset="utf-8">
<title>{{ .Title }}{{ if ne .Title .Site.Title }} // {{ .Site.Title }}{{ end }}</title> <title>{{ .Title }}{{ if ne .Title .Site.Title }} // {{ .Site.Title }}{{ end }}</title>
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1"> {{ partial "meta.html" . }}
{{ partial "og.html" . }} {{ partial "og.html" . }}
<link href="{{ .RSSLink }}" rel="alternate" type="application/rss+xml" title="{{ .Site.Title }}" /> <link href="{{ .RSSLink }}" rel="alternate" type="application/rss+xml" title="{{ .Site.Title }}" />
@@ -16,14 +15,6 @@
<link rel="stylesheet" href="{{ .Site.BaseURL }}css/style.css"> <link rel="stylesheet" href="{{ .Site.BaseURL }}css/style.css">
<link href="http://gmpg.org/xfn/11" rel="profile"> <link href="http://gmpg.org/xfn/11" rel="profile">
<meta http-equiv="content-type" content="text/html; charset=utf-8">
<!-- Enable responsiveness on mobile devices-->
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1">
<meta name="description" content="{{ .Description }}">
<meta name="keywords" content="{{ range .Keywords }}{{ . }},{{ end }}">
<meta name="author" content="{{ .Params.author }}">
{{ .Hugo.Generator }} {{ .Hugo.Generator }}
</head> </head>

View File

@@ -0,0 +1,6 @@
<meta charset="utf-8">
<meta http-equiv="content-type" content="text/html; charset=utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1">
<meta name="description" content="{{ .Site.Params.Description }}">
<meta name="keywords" content="{{ range .Site.Params.Keywords }}{{ . }},{{ end }}">
<meta name="author" content="{{ .Site.Params.Author }}">

View File

@@ -1,8 +1,8 @@
<meta property="og:title" content="{{ if .Params.ogtitle }}{{ .Params.ogtitle }}{{ else }}{{ .Title }}{{ end }}" /> <meta property="og:title" content="{{ if .Params.ogtitle }}{{ .Params.ogtitle }}{{ else }}{{ .Title }}{{ end }}" />
<meta property="og:description" content="{{ if .Params.ogdescription }}{{ .Params.ogdescription }}{{ else }}{{ .Description }}{{ end }}" /> <meta property="og:description" content="{{ if .Params.ogdescription }}{{ .Params.ogdescription }}{{ else }}{{ .Site.Params.Description }}{{ end }}" />
<meta property="og:type" content="website" /> <meta property="og:type" content="website" />
<meta property="og:locale" content="en_US" /> <meta property="og:locale" content="en_US" />
<meta property="og:url" content="{{ .Permalink }}" /> <meta property="og:url" content="{{ .Permalink }}" />
{{ if .Params.ogimage }} {{ if .Params.ogimage }}
<meta property="og:image" content="{{ .Params.ogimage }}" /> <meta property="og:image" content="{{ .Params.ogimage }}" />
{{ end }} {{ end }}