open graph image and copyright

2 files changed, 53 insertions, 0 deletions

diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html
index c95abb9..c35d857 100644
--- a/layouts/partials/footer.html
+++ b/layouts/partials/footer.html
@@ -1,3 +1,10 @@
+<<<<<<< HEAD
+<footer id="footer" class="mobile-only">
+    <p class="small">
+          {{ .Site.Copyright }}
+    </p>
+</footer>
+=======
 <footer id="footer" class="mobile-only">

     <p class="small">

       {{ if or (.Site.Params.copyright) (.Site.Params.credit) }}

@@ -12,3 +19,4 @@
       {{ end }}

     </p>

 </footer>

+>>>>>>> bc3b59fd459be92483fe0d7e20a8169a3ec1543d
diff --git a/layouts/partials/head.html b/layouts/partials/head.html
index 7426bae..a89fc0c 100644
--- a/layouts/partials/head.html
+++ b/layouts/partials/head.html
@@ -1,3 +1,47 @@
+<<<<<<< HEAD
+<meta charset="utf-8">
+<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+<meta name="viewport" content="width=device-width, initial-scale=1">
+<base href="{{ .Site.BaseURL }}">
+{{ with .Site.Params.author }}<meta name="author" content="{{ . }}">{{ end }}
+{{ with .Site.Params.description }}<meta name="description" content="{{ . }}">{{ end }}
+{{ .Hugo.Generator }}
+<title>{{ .Title }}</title>
+<link rel="shortcut icon" href="{{ "images/favicon.ico" | absURL }}">
+<link rel="stylesheet" href="{{ "css/style.css" | absURL }}">
+<link rel="stylesheet" href="{{ "css/highlight.css" | absURL }}">
+{{ if .Site.Params.customCSS }}
+  {{ partials "css.html" . }}
+{{ end }}
+
+<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/latest/css/font-awesome.min.css">
+
+{{ if .Site.Params.enableRSS }}
+<link href="{{ .Site.RSSLink }}" rel="alternate" type="application/rss+xml" title="{{ .Site.Title }}" />
+{{ end }}
+
+{{ if .Site.Params.twitter }}
+  <meta name="twitter:card" content="summary_large_image">
+  <meta name="twitter:site" content="@{{ .Site.Params.twitter }}">
+  <meta name="twitter:creator" content="@{{ .Site.Params.twitter }}">
+{{ end }}
+
+<meta property="og:title" content="{{ if .IsHome }}{{ .Site.Title }}{{ else if .Params.heading }}{{ .Params.heading }}{{ else }}{{ .Title }}{{ end }}">
+<meta property="og:type" content="website">
+<meta property="og:url" content="{{ .Site.BaseURL }}">
+
+{{ if .Site.Params.opengraphImage}}
+  <meta property="og:image" content="{{ if .Params.featuredImage }}{{ .Site.BaseURL }}{{ .Params.featuredImage }}{{ else }}{{ .Site.BaseURL }}{{ .Site.Params.opengraphImage}}{{ end }}">
+{{ end }}
+
+{{ if .Description }}
+  <meta name="og:description" content="{{ .Description }}">
+{{ else if .Site.Params.description }}
+  <meta property="og:description" content="{{ .Site.Params.description}}">
+{{ end }}
+
+<link rel="canonical" href="{{ .Permalink }}">
+=======
 <meta charset="utf-8">

 <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">

 <meta name="viewport" content="width=device-width, initial-scale=1">

@@ -40,3 +84,4 @@
 {{ end }}

 

 <link rel="canonical" href="{{ .Permalink }}">

+>>>>>>> bc3b59fd459be92483fe0d7e20a8169a3ec1543d