Merge branch 'master' into master

This commit is contained in:
liwenyip 2017-02-26 11:42:49 +00:00 committed by GitHub
commit 44bdb457db
15 changed files with 189 additions and 7499 deletions

View file

@ -0,0 +1,66 @@
<!DOCTYPE html>
<html lang="en">
{{ partial "head.html" . }}
<body>
{{ partial "nav.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">
{{ $pag := .Paginate (where .Data.Pages "Type" "post") }}
{{ range $pag.Pages }}
<article class="post-preview">
<a href="{{ .Permalink }}">
<h2 class="post-title">{{ .Title }}</h2>
{{ if .Params.subtitle }}
<h3 class="post-subtitle">
{{ .Params.subtitle }}
</h3>
{{ end }}
</a>
<p class="post-meta">
Posted on {{ .Date.Format "January 2, 2006" }}
</p>
<div class="post-entry">
{{ if .Truncated }}
{{ .Summary }}
<a href="{{ .Permalink }}" class="post-read-more">[Read&nbsp;More]</a>
{{ 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 }}
</div>
</div>
{{ partial "footer.html" . }}
</body>
</html>

View file

@ -0,0 +1,36 @@
<!DOCTYPE html>
<html lang="en">
{{ partial "head.html" . }}
<body>
{{ partial "nav.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">
<article class="post-preview">
{{ range $key, $value := .Data.Terms.ByCount }}
<li>
<a href="/tags/{{ $value.Name | urlize }}">
{{ $value.Name }}({{ $value.Count }})</a>
</li>
{{ end }}
</article>
</div>
</body>
</html>

View file

@ -51,7 +51,6 @@
<p class="post-meta">
Posted on {{ .Date.Format "January 2, 2006" }}
</p>
<div class="post-entry">
{{ if .Truncated }}
{{ .Summary }}
@ -60,7 +59,15 @@
{{ .Content }}
{{ end }}
</div>
{{ if .Params.tags }}
<span class="post-meta">
{{ range .Params.tags }}
#<a href="/tags/{{ . | urlize }}">{{ . }}</a>&nbsp;
{{ end }}
</span>
{{ end }}
</article>
{{ end }}
</div>

View file

@ -3,6 +3,16 @@
<div class="row">
<div class="col-lg-8 col-lg-offset-2 col-md-10 col-md-offset-1">
<ul class="list-inline text-center footer-links">
{{ if .Site.Author.email }}
<li>
<a href="mailto:{{ .Site.Author.email }}" title="Email me">
<span class="fa-stack fa-lg">
<i class="fa fa-circle fa-stack-2x"></i>
<i class="fa fa-envelope fa-stack-1x fa-inverse"></i>
</span>
</a>
</li>
{{ end }}
{{ if .Site.Author.facebook }}
<li>
<a href="https://www.facebook.com/{{ .Site.Author.facebook }}" title="Facebook">
@ -13,6 +23,16 @@
</a>
</li>
{{ end }}
{{ if .Site.Author.googleplus }}
<li>
<a href="https://www.plus.google.com/{{ .Site.Author.googleplus }}" title="Google+">
<span class="fa-stack fa-lg">
<i class="fa fa-circle fa-stack-2x"></i>
<i class="fa fa-google-plus fa-stack-1x fa-inverse"></i>
</span>
</a>
</li>
{{ end }}
{{ if .Site.Author.github }}
<li>
<a href="https://github.com/{{ .Site.Author.github }}" title="GitHub">
@ -33,12 +53,12 @@
</a>
</li>
{{ end }}
{{ if .Site.Author.email }}
{{ if .Site.Author.reddit }}
<li>
<a href="mailto:{{ .Site.Author.email }}" title="Email me">
<a href="https://reddit.com/u/{{ .Site.Author.reddit }}" title="Reddit">
<span class="fa-stack fa-lg">
<i class="fa fa-circle fa-stack-2x"></i>
<i class="fa fa-envelope fa-stack-1x fa-inverse"></i>
<i class="fa fa-reddit-alien fa-stack-1x fa-inverse"></i>
</span>
</a>
</li>
@ -52,6 +72,16 @@
</span>
</a>
</li>
{{ end }}
{{ if .Site.Author.xing }}
<li>
<a href="https://www.xing.com/profile/{{ .Site.Author.xing }}" title="Xing">
<span class="fa-stack fa-lg">
<i class="fa fa-circle fa-stack-2x"></i>
<i class="fa fa-xing fa-stack-1x fa-inverse"></i>
</span>
</a>
</li>
{{ end }}
{{ if .Site.Author.stackoverflow }}
<li>
@ -63,16 +93,16 @@
</a>
</li>
{{ end }}
{{ if .Site.Author.soundcloud }}
{{ if .Site.Author.snapchat }}
<li>
<a href="https://soundcloud.com/{{ .Site.Author.soundcloud }}" title="SoundCloud">
<a href="https://www.snapchat.com/add/{{ .Site.Author.snapchat }}" title="Snapchat">
<span class="fa-stack fa-lg">
<i class="fa fa-circle fa-stack-2x"></i>
<i class="fa fa-soundcloud fa-stack-1x fa-inverse"></i>
<i class="fa fa-snapchat-ghost fa-stack-1x fa-inverse"></i>
</span>
</a>
</li>
{{ end }}
{{ end }}
{{ if .Site.Author.instagram }}
<li>
<a href="https://www.instagram.com/{{ .Site.Author.instagram }}" title="Instagram">
@ -93,6 +123,16 @@
</a>
</li>
{{ end }}
{{ if .Site.Author.soundcloud }}
<li>
<a href="https://soundcloud.com/{{ .Site.Author.soundcloud }}" title="SoundCloud">
<span class="fa-stack fa-lg">
<i class="fa fa-circle fa-stack-2x"></i>
<i class="fa fa-soundcloud fa-stack-1x fa-inverse"></i>
</span>
</a>
</li>
{{ end }}
{{ if .Site.Author.spotify }}
<li>
<a href="https://open.spotify.com/user/{{ .Site.Author.spotify }}" title="Spotify">
@ -103,6 +143,16 @@
</a>
</li>
{{ end }}
{{ if .Site.Author.bandcamp }}
<li>
<a href="https://{{ .Site.Author.bandcamp }}.bandcamp.com/" title="Bandcamp">
<span class="fa-stack fa-lg">
<i class="fa fa-circle fa-stack-2x"></i>
<i class="fa fa-bandcamp fa-stack-1x fa-inverse"></i>
</span>
</a>
</li>
{{ end }}
{{ if .Site.Author.itchio }}
<li>
<a href="https://itch.io/profile/{{ .Site.Author.itchio }}" title="Itch.io">
@ -144,10 +194,10 @@
</div>
</footer>
<script src="{{ .Site.BaseURL }}/js/jquery-1.11.2.min.js"></script>
<script src="{{ .Site.BaseURL }}/js/bootstrap.min.js"></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="{{ .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>
hljs.initHighlightingOnLoad();
</script>

View file

@ -11,13 +11,13 @@
<link rel="alternate" href="{{ "/index.xml" | absURL }}" type="application/rss+xml" title="{{ .Site.Title }}">
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.6.0/css/font-awesome.min.css" />
<link rel="stylesheet" href="{{ .Site.BaseURL }}/css/bootstrap.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="{{ .Site.BaseURL }}/css/main.css" />
<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Lora:400,700,400italic,700italic" />
<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">
<link rel="stylesheet" href="{{ .Site.BaseURL }}/css/highlight.min.css">
<!-- Facebook OpenGraph tags -->
<meta property="og:title" content="{{ .Title }}" />