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 305 additions and 233 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
exampleSite/config.toml
View File

@ -11,17 +11,10 @@ pygmentCodeFences = true
subtitle = "Build a beautiful and simple website in minutes" subtitle = "Build a beautiful and simple website in minutes"
logo = "img/avatar-icon.png" logo = "img/avatar-icon.png"
favicon = "img/favicon.ico" favicon = "img/favicon.ico"
commit = false
dateFormat = "January 2, 2006" dateFormat = "January 2, 2006"
commit = false
[[Params.bigimg]] rss = true
src = "img/path.jpg" comments = true
desc = "Path"
# if you add more than one bigimg they will cycle through every 10 seconds
#[[Params.bigimg]]
# src = "img/path.jpg"
# desc = "Another Path"
[Author] [Author]
name = "Some Person" name = "Some Person"
@ -57,15 +50,23 @@ pygmentCodeFences = true
name = "Samples" name = "Samples"
weight = 2 weight = 2
[[menu.main]]
parent = "samples"
name = "Math Sample"
url = "/post/2017-03-05-math-sample"
weight = 1
[[menu.main]] [[menu.main]]
parent = "samples" parent = "samples"
name = "Code Sample" name = "Code Sample"
url = "/post/2016-03-08-code-sample" url = "/post/2016-03-08-code-sample"
weight = 2
[[menu.main]] [[menu.main]]
parent = "samples" parent = "samples"
name = "Test Markdown" name = "Test Markdown"
url = "/post/2015-02-20-test-markdown" url = "/post/2015-02-20-test-markdown"
weight = 3
[[menu.main]] [[menu.main]]
name = "Tags" name = "Tags"

20
exampleSite/content/post/2015-02-20-test-markdown.md
View File

@ -25,16 +25,7 @@ How about a yummy crepe?
![Crepe](http://s3-media3.fl.yelpcdn.com/bphoto/cQ1Yoa75m2yUFFbY2xwuqw/348s.jpg) ![Crepe](http://s3-media3.fl.yelpcdn.com/bphoto/cQ1Yoa75m2yUFFbY2xwuqw/348s.jpg)
Here's a code chunk: Here's a code chunk with syntax highlighting:
~~~
var foo = function(x) {
return(x + 5);
}
foo(3)
~~~
And here is the same code with syntax highlighting:
```javascript ```javascript
var foo = function(x) { var foo = function(x) {
@ -42,12 +33,3 @@ var foo = function(x) {
} }
foo(3) foo(3)
``` ```
And here is the same code yet again but with line numbers:
{{< highlight python linenos >}}
var foo = function(x) {
return(x + 5);
}
foo(3)
{{</ highlight >}}

19
exampleSite/content/post/2016-03-08-code-sample.md
View File

@ -1,6 +1,6 @@
--- ---
title: Code Sample title: Code Sample
subtitle: Using Pygments or Highlight.js subtitle: Using Hugo or Pygments
date: 2016-03-08 date: 2016-03-08
tags: ["example", "code"] tags: ["example", "code"]
--- ---
@ -9,6 +9,17 @@ The following are two code samples using syntax highlighting.
<!--more--> <!--more-->
The following is a code sample using triple backticks ( ``` ) code fencing provided in Hugo. This is client side highlighting and does not require any special installation.
```javascript
var num1, num2, sum
num1 = prompt("Enter first number")
num2 = prompt("Enter second number")
sum = parseInt(num1) + parseInt(num2) // "+" means "add"
alert("Sum = " + sum) // "+" means combine into a string
```
The following is a code sample using the "highlight" shortcode provided in Hugo. This is server side highlighting and requires Python and Pygments to be installed. The following is a code sample using the "highlight" shortcode provided in Hugo. This is server side highlighting and requires Python and Pygments to be installed.
{{< highlight javascript >}} {{< highlight javascript >}}
@ -20,12 +31,12 @@ The following is a code sample using the "highlight" shortcode provided in Hugo.
{{</ highlight >}} {{</ highlight >}}
The following is a code sample using triple backticks ( ``` ) code fencing provided in Hugo. This is client side highlighting and does not require any special installation. And here is the same code with line numbers:
```javascript {{< highlight javascript "linenos=inline">}}
var num1, num2, sum var num1, num2, sum
num1 = prompt("Enter first number") num1 = prompt("Enter first number")
num2 = prompt("Enter second number") num2 = prompt("Enter second number")
sum = parseInt(num1) + parseInt(num2) // "+" means "add" sum = parseInt(num1) + parseInt(num2) // "+" means "add"
alert("Sum = " + sum) // "+" means combine into a string alert("Sum = " + sum) // "+" means combine into a string
``` {{</ highlight >}}

49
exampleSite/content/post/2017-03-05-math-sample.md Normal file
View File

@ -0,0 +1,49 @@
---
title: Math Sample
subtitle: Using KaTeX
date: 2017-03-05
tags: ["example", "math"]
---
KaTeX can be used to generate complex math formulas server-side.
$$
\phi = \frac{(1+\sqrt{5})}{2} = 1.6180339887\cdots
$$
Additional details can be found on [GitHub](https://github.com/Khan/KaTeX) or on the [Wiki](http://tiddlywiki.com/plugins/tiddlywiki/katex/).
<!--more-->
### Example 1
If the text between $$ contains newlines it will rendered in display mode:
```
$$
f(x) = \int_{-\infty}^\infty\hat f(\xi)\,e^{2 \pi i \xi x}\,d\xi
$$
```
$$
f(x) = \int_{-\infty}^\infty\hat f(\xi)\,e^{2 \pi i \xi x}\,d\xi
$$
### Example 2
```
$$
\frac{1}{\Bigl(\sqrt{\phi \sqrt{5}}-\phi\Bigr) e^{\frac25 \pi}} = 1+\frac{e^{-2\pi}} {1+\frac{e^{-4\pi}} {1+\frac{e^{-6\pi}} {1+\frac{e^{-8\pi}} {1+\cdots} } } }
$$
```
​​$$
\frac{1}{\Bigl(\sqrt{\phi \sqrt{5}}-\phi\Bigr) e^{\frac25 \pi}} = 1+\frac{e^{-2\pi}} {1+\frac{e^{-4\pi}} {1+\frac{e^{-6\pi}} {1+\frac{e^{-8\pi}} {1+\cdots} } } }
$$
​​
### Example 3
```
$$
1 + \frac{q^2}{(1-q)}+\frac{q^6}{(1-q)(1-q^2)}+\cdots = \prod_{j=0}^{\infty}\frac{1}{(1-q^{5j+2})(1-q^{5j+3})}, \quad\quad \text{for }\lvert q\rvert<1.
$$
```
$$
1 + \frac{q^2}{(1-q)}+\frac{q^6}{(1-q)(1-q^2)}+\cdots = \prod_{j=0}^{\infty}\frac{1}{(1-q^{5j+2})(1-q^{5j+3})}, \quad\quad \text{for }\lvert q\rvert<1.
$$

19
layouts/404.html
View File

@ -7,17 +7,14 @@
{{ partial "nav.html" . }} {{ partial "nav.html" . }}
<div role="main" class="container main-content"> <div role="main" class="container main-content">
<div class="text-center">
<div class="text-center"> <h1>Whoops, this page doesn't exist.</h1>
<h1>Whoops, this page doesn't exist.</h1> <h1>Move along. (404 error)</h1>
<h1>Move along. (404 error)</h1> <br/>
<br/> <img src="{{ .Site.BaseURL }}/img/404-southpark.jpg" />
</div>
<img src="{{ .Site.BaseURL }}/img/404-southpark.jpg" /> </div>
</div>
</div>
{{ partial "footer.html" . }} {{ partial "footer.html" . }}

65
layouts/_default/list.html
View File

@ -22,42 +22,39 @@
</header> </header>
<div class="container" role="main"> <div class="container" role="main">
{{ $pag := .Paginate (where .Data.Pages "Type" "post") }} {{ $pag := .Paginate (where .Data.Pages "Type" "post") }}
{{ range $pag.Pages }} {{ range $pag.Pages }}
<article class="post-preview"> <article class="post-preview">
<a href="{{ .Permalink }}"> <a href="{{ .Permalink }}">
<h2 class="post-title">{{ .Title }}</h2> <h2 class="post-title">{{ .Title }}</h2>
{{ if .Params.subtitle }}
{{ if .Params.subtitle }} <h3 class="post-subtitle">
<h3 class="post-subtitle"> {{ .Params.subtitle }}
{{ .Params.subtitle }} </h3>
</h3> {{ end }}
{{ end }} </a>
</a> <p class="post-meta">
Posted on {{ .Date.Format .Site.Params.dateFormat }}
<p class="post-meta"> </p>
Posted on {{ .Date.Format .Site.Params.dateFormat }} <div class="post-entry">
</p> {{ if .Truncated }}
<div class="post-entry"> {{ .Summary }}
{{ if .Truncated }} <a href="{{ .Permalink }}" class="post-read-more">[Read&nbsp;More]</a>
{{ .Summary }} {{ else }}
<a href="{{ .Permalink }}" class="post-read-more">[Read&nbsp;More]</a> {{ .Content }}
{{ else }}
{{ .Content }}
{{ end }}
</div>
{{ if .Params.tags }}
<span class="post-meta">
{{ range .Params.tags }}
#<a href="/tags/{{ . | urlize }}">{{ . }}</a>&nbsp;
{{ end }}
</span>
{{ end }}
</article>
{{ end }} {{ end }}
</div> </div>
{{ if .Params.tags }}
<span class="post-meta">
{{ range .Params.tags }}
#<a href="/tags/{{ . | urlize }}">{{ . }}</a>&nbsp;
{{ end }}
</span>
{{ end }}
</article>
{{ end }}
</div> </div>
{{ partial "footer.html" . }} {{ partial "footer.html" . }}

25
layouts/_default/terms.html
View File

@ -6,31 +6,20 @@
<body> <body>
{{ partial "nav.html" . }} {{ partial "nav.html" . }}
{{ partial "header_wp.html" . }}
<header class="header-section ">
<div class="intro-header no-img">
<div class="container">
<div class="row">
<div class="col-lg-8 col-lg-offset-2 col-md-10 col-md-offset-1">
<div class="page-heading">
<h2>{{ .Title }}</h2>
</div>
</div>
</div>
</div>
</div>
</header>
<div class="container" role="main"> <div class="container" role="main">
<article class="post-preview"> <article class="post-preview">
<div class="list-group col-lg-4 col-lg-offset-4 col-md-6 col-md-offset-3">
{{ range $key, $value := .Data.Terms.ByCount }} {{ range $key, $value := .Data.Terms.ByCount }}
<li> <a href="/tags/{{ $value.Name | urlize }}" class="list-group-item">
<a href="/tags/{{ $value.Name | urlize }}"> {{ $value.Name }}<span class="badge">{{ $value.Count }}</span></a>
{{ $value.Name }}({{ $value.Count }})</a>
</li>
{{ end }} {{ end }}
</div>
</article> </article>
</div> </div>
{{ partial "footer.html" . }}
</body> </body>
</html> </html>

66
layouts/index.html
View File

@ -37,54 +37,54 @@
<div class="posts-list"> <div class="posts-list">
{{ $pag := .Paginate (where .Data.Pages "Type" "post") }} {{ $pag := .Paginate (where .Data.Pages "Type" "post") }}
{{ range $pag.Pages }} {{ range $pag.Pages }}
<article class="post-preview"> <article class="post-preview">
<a href="{{ .Permalink }}"> <a href="{{ .Permalink }}">
<h2 class="post-title">{{ .Title }}</h2> <h2 class="post-title">{{ .Title }}</h2>
{{ if .Params.subtitle }} {{ if .Params.subtitle }}
<h3 class="post-subtitle"> <h3 class="post-subtitle">
{{ .Params.subtitle }} {{ .Params.subtitle }}
</h3> </h3>
{{ end }} {{ end }}
</a> </a>
<p class="post-meta"> <p class="post-meta">
Posted on {{ .Date.Format .Site.Params.dateFormat }} Posted on {{ .Date.Format .Site.Params.dateFormat }}
</p> </p>
<div class="post-entry"> <div class="post-entry">
{{ if .Truncated }} {{ if .Truncated }}
{{ .Summary }} {{ .Summary }}
<a href="{{ .Permalink }}" class="post-read-more">[Read&nbsp;More]</a> <a href="{{ .Permalink }}" class="post-read-more">[Read&nbsp;More]</a>
{{ else }} {{ else }}
{{ .Content }} {{ .Content }}
{{ end }} {{ end }}
</div> </div>
{{ if .Params.tags }} {{ if .Params.tags }}
<span class="post-meta"> <span class="post-meta">
{{ range .Params.tags }} {{ range .Params.tags }}
#<a href="/tags/{{ . | urlize }}">{{ . }}</a>&nbsp; #<a href="/tags/{{ . | urlize }}">{{ . }}</a>&nbsp;
{{ end }} {{ end }}
</span> </span>
{{ end }} {{ end }}
</article> </article>
{{ end }} {{ end }}
</div> </div>
{{ if or (.Paginator.HasPrev) (.Paginator.HasNext) }} {{ if or (.Paginator.HasPrev) (.Paginator.HasNext) }}
<ul class="pager main-pager"> <ul class="pager main-pager">
{{ if .Paginator.HasPrev }} {{ if .Paginator.HasPrev }}
<li class="previous"> <li class="previous">
<a href="{{ .URL }}page/{{ .Paginator.Prev.PageNumber }}">&larr; Newer Posts</a> <a href="{{ .URL }}page/{{ .Paginator.Prev.PageNumber }}">&larr; Newer Posts</a>
</li> </li>
{{ end }} {{ end }}
{{ if .Paginator.HasNext }} {{ if .Paginator.HasNext }}
<li class="next"> <li class="next">
<a href="{{ .URL }}page/{{ .Paginator.Next.PageNumber }}">Older Posts &rarr;</a> <a href="{{ .URL }}page/{{ .Paginator.Next.PageNumber }}">Older Posts &rarr;</a>
</li> </li>
{{ end }} {{ end }}
</ul> </ul>
{{ end }} {{ end }}
</div> </div>
</div> </div>

6
layouts/partials/disqus.html
View File

@ -1,5 +1,7 @@
{{ if and .Site.DisqusShortname (not .Params.nocomments) }} {{ if (.Params.comments) | or (and (not (isset .Params "comments")) (.Site.Params.comments)) }}
{{ if .Site.DisqusShortname }}
<div class="comments"> <div class="comments">
{{ template "_internal/disqus.html" . }} {{ template "_internal/disqus.html" . }}
</div> </div>
{{ end }}
{{ end }} {{ end }}

57
layouts/partials/footer.html
View File

@ -43,7 +43,7 @@
</a> </a>
</li> </li>
{{ end }} {{ end }}
{{ if .Site.Author.twitter }} {{ if .Site.Author.twitter }}
<li> <li>
<a href="https://twitter.com/{{ .Site.Author.twitter }}" title="Twitter"> <a href="https://twitter.com/{{ .Site.Author.twitter }}" title="Twitter">
<span class="fa-stack fa-lg"> <span class="fa-stack fa-lg">
@ -63,7 +63,7 @@
</a> </a>
</li> </li>
{{ end }} {{ end }}
{{ if .Site.Author.linkedin }} {{ if .Site.Author.linkedin }}
<li> <li>
<a href="https://linkedin.com/in/{{ .Site.Author.linkedin }}" title="LinkedIn"> <a href="https://linkedin.com/in/{{ .Site.Author.linkedin }}" title="LinkedIn">
<span class="fa-stack fa-lg"> <span class="fa-stack fa-lg">
@ -83,7 +83,7 @@
</a> </a>
</li> </li>
{{ end }} {{ end }}
{{ if .Site.Author.stackoverflow }} {{ if .Site.Author.stackoverflow }}
<li> <li>
<a href="https://stackoverflow.com/{{ .Site.Author.stackoverflow }}" title="StackOverflow"> <a href="https://stackoverflow.com/{{ .Site.Author.stackoverflow }}" title="StackOverflow">
<span class="fa-stack fa-lg"> <span class="fa-stack fa-lg">
@ -163,43 +163,44 @@
</a> </a>
</li> </li>
{{ end }} {{ end }}
{{ if .Site.Params.rss }}
<li> <li>
<a href="{{ .Site.BaseURL}}index.xml" title="RSS"> <a href="{{ .Site.BaseURL}}index.xml" title="RSS">
<span class="fa-stack fa-lg"> <span class="fa-stack fa-lg">
<i class="fa fa-circle fa-stack-2x"></i> <i class="fa fa-circle fa-stack-2x"></i>
<i class="fa fa-rss fa-stack-1x fa-inverse"></i> <i class="fa fa-rss fa-stack-1x fa-inverse"></i>
</span> </span>
</a> </a>
</li> </li>
{{ end }}
</ul> </ul>
<p class="credits copyright text-muted"> <p class="credits copyright text-muted">
{{ .Site.Author.name }} {{ .Site.Author.name }}
&nbsp;&bull;&nbsp; &nbsp;&bull;&nbsp;
{{ .Site.LastChange.Format "2006" }} {{ .Site.LastChange.Format "2006" }}
{{ if .Site.Title }} {{ if .Site.Title }}
&nbsp;&bull;&nbsp; &nbsp;&bull;&nbsp;
<a href="{{ .Site.BaseURL }}">{{ .Site.Title }}</a> <a href="{{ .Site.BaseURL }}">{{ .Site.Title }}</a>
{{ end }} {{ end }}
</p> </p>
<!-- Please don't remove this, keep my open source work credited :) --> <!-- Please don't remove this, keep my open source work credited :) -->
<p class="credits theme-by text-muted"> <p class="credits theme-by text-muted">
<a href="http://gohugo.io">Hugo v{{ .Hugo.Version }}</a> powered &nbsp;&bull;&nbsp; Theme by <a href="http://deanattali.com/beautiful-jekyll/">beautiful-jekyll</a> adapted to <a href="https://github.com/halogenica/beautifulhugo">Beautiful Hugo</a> <a href="http://gohugo.io">Hugo v{{ .Hugo.Version }}</a> powered &nbsp;&bull;&nbsp; Theme by <a href="http://deanattali.com/beautiful-jekyll/">Beautiful Jekyll</a> adapted to <a href="https://github.com/halogenica/beautifulhugo">Beautiful Hugo</a>
{{ with .Site.Params.commit }}&nbsp;&bull;&nbsp;[<a href="{{.}}{{ getenv "GIT_COMMIT_SHA" }}">{{ getenv "GIT_COMMIT_SHA_SHORT" }}</a>]{{ end }} {{ with .Site.Params.commit }}&nbsp;&bull;&nbsp;[<a href="{{.}}{{ getenv "GIT_COMMIT_SHA" }}">{{ getenv "GIT_COMMIT_SHA_SHORT" }}</a>]{{ end }}
</p> </p>
</div> </div>
</div> </div>
</div> </div>
</footer> </footer>
<script src="https://cdnjs.cloudflare.com/ajax/libs/KaTeX/0.7.1/katex.min.js" integrity="sha384-/y1Nn9+QQAipbNQWU65krzJralCnuOasHncUFXGkdwntGeSvQicrYkiUBwsgUqc1" crossorigin="anonymous"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/KaTeX/0.7.1/contrib/auto-render.min.js" integrity="sha384-dq1/gEHSxPZQ7DdrM82ID4YVol9BYyU7GbWlIwnwyPzotpoc57wDw/guX8EaYGPx" crossorigin="anonymous"></script>
<script src="https://code.jquery.com/jquery-1.12.4.min.js" integrity="sha256-ZosEbRLbNQzLpnKIkEdrPv7lOy9C27hHQ+Xp8a4MxAQ=" crossorigin="anonymous"></script> <script src="https://code.jquery.com/jquery-1.12.4.min.js" integrity="sha256-ZosEbRLbNQzLpnKIkEdrPv7lOy9C27hHQ+Xp8a4MxAQ=" crossorigin="anonymous"></script>
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js" integrity="sha384-Tc5IQib027qvyjSMfHjOMaLkfuWVxZxUPnCJA7l2mCWNIpG9mGCD8wGNIcPD7Txa" crossorigin="anonymous"></script> <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js" integrity="sha384-Tc5IQib027qvyjSMfHjOMaLkfuWVxZxUPnCJA7l2mCWNIpG9mGCD8wGNIcPD7Txa" crossorigin="anonymous"></script>
<script src="{{ .Site.BaseURL }}/js/main.js"></script> <script src="{{ .Site.BaseURL }}/js/main.js"></script>
<script src="{{ .Site.BaseURL }}/js/highlight.min.js"></script> <script src="{{ .Site.BaseURL }}/js/highlight.min.js"></script>
<script> <script> hljs.initHighlightingOnLoad(); </script>
hljs.initHighlightingOnLoad(); <script> renderMathInElement(document.body); </script>
</script>
{{ template "_internal/google_analytics.html" . }} {{ template "_internal/google_analytics.html" . }}

56
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="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/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="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" /> <link rel="stylesheet" href="{{ .Site.BaseURL }}/css/main.css" />
@ -21,28 +22,29 @@
<!-- Facebook OpenGraph tags --> <!-- Facebook OpenGraph tags -->
{{ if .Site.Params.fb_app_id }} {{ 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 }} {{ end }}
{{ if .Params.meta_title }} {{ if .Params.meta_title }}
<meta property="og:title" content="{{ .Params.meta_title }}" /> <meta property="og:title" content="{{ .Params.meta_title }}" />
{{ else if .Title }} {{ else if .Title }}
<meta property="og:title" content="{{ .Title }}" /> <meta property="og:title" content="{{ .Title }}" />
{{ else }} {{ else }}
<meta property="og:title" content="{{ .Site.Title }}" /> <meta property="og:title" content="{{ .Site.Title }}" />
{{ end }} {{ end }}
{{ if .Params.meta_description }} {{ if .Params.meta_description }}
<meta property="og:description" content="{{ .Params.meta_description }}"> <meta property="og:description" content="{{ .Params.meta_description }}">
{{ else if .Params.subtitle }} {{ else if .Params.subtitle }}
<meta property="og:description" content="{{ .Params.subtitle }}"> <meta property="og:description" content="{{ .Params.subtitle }}">
{{ else }} {{ else }}
<meta property="og:description" content="{{ .Content | plainify | htmlEscape | truncate 200 }}"> <meta property="og:description" content="{{ .Content | plainify | htmlEscape | truncate 200 }}">
{{ end }} {{ end }}
<meta property="og:type" content="website" /> <meta property="og:type" content="website" />
{{ if .Params.id }} {{ if .Params.id }}
<<<<<<< HEAD
<meta property="og:url" content="{{ .URL | absURL }}" /> <meta property="og:url" content="{{ .URL | absURL }}" />
<link rel="canonical" href="{{ .URL | absURL }}" /> <link rel="canonical" href="{{ .URL | absURL }}" />
{{ else }} {{ else }}
@ -56,6 +58,21 @@
<meta property="og:image" content="{{ .Params.bigimg | absURL }}" /> <meta property="og:image" content="{{ .Params.bigimg | absURL }}" />
{{ else if .Site.Params.logo }} {{ else if .Site.Params.logo }}
<meta property="og:image" content="{{ .Site.Params.logo | absURL }}" /> <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 }} {{ end }}
<!-- Twitter summary cards --> <!-- Twitter summary cards -->
@ -64,6 +81,7 @@
<meta name="twitter:creator" content="@{{ .Site.Author.twitter }}" /> <meta name="twitter:creator" content="@{{ .Site.Author.twitter }}" />
{{ if .Params.meta_title }} {{ if .Params.meta_title }}
<<<<<<< HEAD
<meta name="twitter:title" content="{{ .Params.meta_title }}" /> <meta name="twitter:title" content="{{ .Params.meta_title }}" />
{{ else if .Title }} {{ else if .Title }}
<meta name="twitter:title" content="{{ .Title }}" /> <meta name="twitter:title" content="{{ .Title }}" />
@ -86,5 +104,29 @@
{{ else if .Site.Params.logo }} {{ else if .Site.Params.logo }}
<meta name="twitter:image" content="{{ .Site.Params.logo | absURL }}" /> <meta name="twitter:image" content="{{ .Site.Params.logo | absURL }}" />
{{ end }} {{ 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> </head>

22
layouts/partials/header.html
View File

@ -3,18 +3,18 @@
<div class="col-lg-8 col-lg-offset-2 col-md-10 col-md-offset-1"> <div class="col-lg-8 col-lg-offset-2 col-md-10 col-md-offset-1">
<div class="{{ .Type }}-heading"> <div class="{{ .Type }}-heading">
<h1>{{ if .Title }}{{ .Title }}{{ else }}<br/>{{ end }}</h1> <h1>{{ if .Title }}{{ .Title }}{{ else }}<br/>{{ end }}</h1>
{{ if .Params.subtitle }} {{ if .Params.subtitle }}
{{ if eq .Type "page" }} {{ if eq .Type "page" }}
<hr class="small"> <hr class="small">
<span class="{{ .Type }}-subheading">{{ .Params.subtitle }}</span> <span class="{{ .Type }}-subheading">{{ .Params.subtitle }}</span>
{{ else }} {{ else }}
<h2 class="{{ .Type }}-subheading">{{ .Params.subtitle }}</h2> <h2 class="{{ .Type }}-subheading">{{ .Params.subtitle }}</h2>
{{ end }} {{ end }}
{{ end }} {{ end }}
{{ if eq .Type "post" }} {{ if eq .Type "post" }}
<span class="post-meta">Posted on {{ .Date.Format .Site.Params.dateFormat }}</span> <span class="post-meta">Posted on {{ .Date.Format .Site.Params.dateFormat }}</span>
{{ end }} {{ end }}
</div> </div>
</div> </div>
</div> </div>

17
layouts/partials/header_wp.html
View File

@ -1,21 +1,18 @@
<!-- TODO this file has become a mess, refactor it -->
{{ if or .Params.bigimg .Title }} {{ if or .Params.bigimg .Title }}
{{ if .Params.bigimg }} {{ if .Params.bigimg }}
<div id="header-big-imgs" data-num-img=1 data-img-src-1="{{.Params.bigimg}}"></div> <div id="header-big-imgs" data-num-img=1 data-img-src-1="{{.Params.bigimg}}"></div>
{{ end }} {{ end }}
<header class="header-section {{ if .Params.bigimg }}has-img{{ end }}"> <header class="header-section {{ if .Params.bigimg }}has-img{{ end }}">
{{ if .Params.bigimg }} {{ if .Params.bigimg }}
<div class="big-img intro-header"> <div class="big-img intro-header">
{{ partial "header.html" . }}
<span class='img-desc'></span>
</div>
{{ end }}
<div class="intro-header no-img">
{{ partial "header.html" . }} {{ partial "header.html" . }}
<span class='img-desc'></span>
</div> </div>
{{ end }}
<div class="intro-header no-img">
{{ partial "header.html" . }}
</div>
</header> </header>
{{ else }} {{ else }}
<div class="intro-header"></div> <div class="intro-header"></div>

46
layouts/partials/nav.html
View File

@ -12,34 +12,34 @@
<div class="collapse navbar-collapse" id="main-navbar"> <div class="collapse navbar-collapse" id="main-navbar">
<ul class="nav navbar-nav navbar-right"> <ul class="nav navbar-nav navbar-right">
{{ range .Site.Menus.main.ByWeight }} {{ range .Site.Menus.main.ByWeight }}
{{ if .HasChildren }} {{ if .HasChildren }}
<li class="navlinks-container"> <li class="navlinks-container">
<a class="navlinks-parent" href="javascript:void(0)">{{ .Name }}</a> <a class="navlinks-parent" href="javascript:void(0)">{{ .Name }}</a>
<div class="navlinks-children"> <div class="navlinks-children">
{{ range .Children }} {{ range .Children }}
<a href="{{ .URL }}">{{ .Name }}</a> <a href="{{ .URL }}">{{ .Name }}</a>
{{ end }} {{ end }}
</div> </div>
</li> </li>
{{ else }} {{ else }}
<li> <li>
<a title="{{ .Name }}" href="{{ .URL }}">{{ .Name }}</a> <a title="{{ .Name }}" href="{{ .URL }}">{{ .Name }}</a>
</li> </li>
{{ end }} {{ end }}
{{ end }} {{ end }}
</ul> </ul>
</div> </div>
<div class="avatar-container"> <div class="avatar-container">
<div class="avatar-img-border"> <div class="avatar-img-border">
{{ if isset .Site.Params "logo" }} {{ if isset .Site.Params "logo" }}
<a title="{{ .Site.Title }}" href="{{ .Site.BaseURL }}"> <a title="{{ .Site.Title }}" href="{{ .Site.BaseURL }}">
<img class="avatar-img" src="{{ .Site.BaseURL }}/{{ .Site.Params.logo }}" alt="{{ .Site.Title }}" /> <img class="avatar-img" src="{{ .Site.BaseURL }}/{{ .Site.Params.logo }}" alt="{{ .Site.Title }}" />
</a> </a>
{{ end }} {{ end }}
</div> </div>
</div> </div>
</div> </div>
</nav> </nav>

10
layouts/partials/page.html
View File

@ -2,10 +2,12 @@
<div class="row"> <div class="row">
<div class="col-lg-8 col-lg-offset-2 col-md-10 col-md-offset-1"> <div class="col-lg-8 col-lg-offset-2 col-md-10 col-md-offset-1">
{{ .Content }} {{ .Content }}
{{ if and .Site.DisqusShortname (not .Params.nocomments) }} {{ if (.Params.comments) | or (and (not (isset .Params "comments")) (.Site.Params.comments)) }}
<div class="disqus-comments"> {{ if .Site.DisqusShortname }}
{{ template "_internal/disqus.html" . }} <div class="disqus-comments">
</div> {{ template "_internal/disqus.html" . }}
</div>
{{ end }}
{{ end }} {{ end }}
</div> </div>
</div> </div>

24
layouts/partials/post.html
View File

@ -2,26 +2,28 @@
<div class="row"> <div class="row">
<div class="col-lg-8 col-lg-offset-2 col-md-10 col-md-offset-1"> <div class="col-lg-8 col-lg-offset-2 col-md-10 col-md-offset-1">
<article role="main" class="blog-post"> <article role="main" class="blog-post">
{{ .Content }} {{ .Content }}
</article> </article>
<ul class="pager blog-pager"> <ul class="pager blog-pager">
{{ if .PrevInSection }} {{ if .PrevInSection }}
<li class="previous"> <li class="previous">
<a href="{{ .PrevInSection.Permalink }}" data-toggle="tooltip" data-placement="top" title="{{ .PrevInSection.Title }}">&larr; Previous Post</a> <a href="{{ .PrevInSection.Permalink }}" data-toggle="tooltip" data-placement="top" title="{{ .PrevInSection.Title }}">&larr; Previous Post</a>
</li> </li>
{{ end }} {{ end }}
{{ if .NextInSection }} {{ if .NextInSection }}
<li class="next"> <li class="next">
<a href="{{ .NextInSection.Permalink }}" data-toggle="tooltip" data-placement="top" title="{{ .NextInSection.Title }}">Next Post &rarr;</a> <a href="{{ .NextInSection.Permalink }}" data-toggle="tooltip" data-placement="top" title="{{ .NextInSection.Title }}">Next Post &rarr;</a>
</li> </li>
{{ end }} {{ end }}
</ul> </ul>
{{ if and .Site.DisqusShortname (not .Params.nocomments) }} {{ if (.Params.comments) | or (and (not (isset .Params "comments")) (.Site.Params.comments)) }}
<div class="disqus-comments"> {{ if .Site.DisqusShortname }}
{{ template "_internal/disqus.html" . }} <div class="disqus-comments">
</div> {{ template "_internal/disqus.html" . }}
</div>
{{ end }}
{{ end }} {{ end }}
</div> </div>