nemunaire/nemhugo
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Resolve conflicts with remote-tracking branch 'refs/remotes/halogenica/master'

Browse source 
# Conflicts:
#	exampleSite/config.toml
#	exampleSite/content/page/about.md
#	layouts/_default/list.html
#	layouts/partials/disqus.html
#	layouts/partials/head.html
#	layouts/partials/header.html
#	layouts/partials/page.html
#	layouts/partials/post.html
This commit is contained in:
Li-Wen Yip 2017-03-08 19:03:10 +00:00
commit 027faa06a2
17 changed files with 304 additions and 232 deletions
Download patch file Download diff file Expand all files Collapse all files

58
layouts/partials/head.html
View file

@ -11,6 +11,7 @@
<link rel="alternate" href="{{ "/index.xml" | absURL }}" type="application/rss+xml" title="{{ .Site.Title }}">
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/KaTeX/0.7.1/katex.min.css" integrity="sha384-wITovz90syo1dJWVh32uuETPVEtGigN07tkttEqPv+uR2SE/mbQcG7ATL28aI9H0" crossorigin="anonymous">
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css" />
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css" integrity="sha384-BVYiiSIFeK1dGmJRAkycuHAHRg32OmUcww7on3RYdg4Va+PmSTsz/K68vbdEjh4u" crossorigin="anonymous">
<link rel="stylesheet" href="{{ .Site.BaseURL }}/css/main.css" />
@ -18,31 +19,32 @@
<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Open+Sans:300italic,400italic,600italic,700italic,800italic,400,300,600,700,800" />
<link rel="stylesheet" href="{{ .Site.BaseURL }}/css/pygment_highlights.css" />
<link rel="stylesheet" href="{{ .Site.BaseURL }}/css/highlight.min.css">
<!-- Facebook OpenGraph tags -->
{{ if .Site.Params.fb_app_id }}
<meta property="fb:app_id" content="{{ .Site.Params.fb_app_id }}" />
<meta property="fb:app_id" content="{{ .Site.Params.fb_app_id }}" />
{{ end }}
{{ if .Params.meta_title }}
<meta property="og:title" content="{{ .Params.meta_title }}" />
<meta property="og:title" content="{{ .Params.meta_title }}" />
{{ else if .Title }}
<meta property="og:title" content="{{ .Title }}" />
<meta property="og:title" content="{{ .Title }}" />
{{ else }}
<meta property="og:title" content="{{ .Site.Title }}" />
<meta property="og:title" content="{{ .Site.Title }}" />
{{ end }}
{{ if .Params.meta_description }}
<meta property="og:description" content="{{ .Params.meta_description }}">
<meta property="og:description" content="{{ .Params.meta_description }}">
{{ else if .Params.subtitle }}
<meta property="og:description" content="{{ .Params.subtitle }}">
<meta property="og:description" content="{{ .Params.subtitle }}">
{{ else }}
<meta property="og:description" content="{{ .Content | plainify | htmlEscape | truncate 200 }}">
<meta property="og:description" content="{{ .Content | plainify | htmlEscape | truncate 200 }}">
{{ end }}
<meta property="og:type" content="website" />
{{ if .Params.id }}
<<<<<<< HEAD
<meta property="og:url" content="{{ .URL | absURL }}" />
<link rel="canonical" href="{{ .URL | absURL }}" />
{{ else }}
@ -56,6 +58,21 @@
<meta property="og:image" content="{{ .Params.bigimg | absURL }}" />
{{ else if .Site.Params.logo }}
<meta property="og:image" content="{{ .Site.Params.logo | absURL }}" />
=======
<meta property="og:url" content="{{ .URL | absURL }}" />
<link rel="canonical" href="{{ .URL | absURL }}" />
{{ else }}
<meta property="og:url" content="{{ .URL | absURL }}" />
<link rel="canonical" href="{{ .URL | absURL }}" />
{{ end }}
{{ if .Params.share_img }}
<meta property="og:image" content="{{ .Params.share_img | absURL }}" />
{{ else if .Params.bigimg }}
<meta property="og:image" content="{{ .Params.bigimg | absURL }}" />
{{ else if .Site.Params.logo }}
<meta property="og:image" content="{{ .Site.Params.logo | absURL }}" />
>>>>>>> refs/remotes/halogenica/master
{{ end }}
<!-- Twitter summary cards -->
@ -64,6 +81,7 @@
<meta name="twitter:creator" content="@{{ .Site.Author.twitter }}" />
{{ if .Params.meta_title }}
<<<<<<< HEAD
<meta name="twitter:title" content="{{ .Params.meta_title }}" />
{{ else if .Title }}
<meta name="twitter:title" content="{{ .Title }}" />
@ -86,5 +104,29 @@
{{ else if .Site.Params.logo }}
<meta name="twitter:image" content="{{ .Site.Params.logo | absURL }}" />
{{ end }}
=======
<meta name="twitter:title" content="{{ .Params.meta_title }}" />
{{ else if .Title }}
<meta name="twitter:title" content="{{ .Title }}" />
{{ else }}
<meta name="twitter:title" content="{{ .Site.Title }}" />
{{ end }}
{{ if .Params.meta_description }}
<meta name="twitter:description" content="{{ .Params.meta_description }}">
{{ else if .Params.subtitle }}
<meta name="twitter:description" content="{{ .Params.subtitle }}">
{{ else }}
<meta name="twitter:description" content="{{ .Content | plainify | htmlEscape | truncate 200 }}">
{{ end }}
{{ if .Params.share_img }}
<meta name="twitter:image" content="{{ .Params.share_img | absURL }}" />
{{ else if .Params.bigimg }}
<meta name="twitter:image" content="{{ .Params.bigimg | absURL }}" />
{{ else if .Site.Params.logo }}
<meta name="twitter:image" content="{{ .Site.Params.logo | absURL }}" />
{{ end }}
>>>>>>> refs/remotes/halogenica/master
</head>