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

@ -26,14 +26,19 @@ pygmentCodeFences = true
name = "Some Person"
email = "youremail@domain.com"
facebook = "username"
googleplus = "+username" # or xxxxxxxxxxxxxxxxxxxxx
github = "username"
twitter = "username"
reddit = "username"
linkedin = "username"
xing = "username"
stackoverflow = "users/XXXXXXX/username"
soundcloud = "username"
snapchat = "username"
instagram = "username"
youtube = "user/username" # or channel/channelname
soundcloud = "username"
spotify = "username"
bandcamp = "username"
itchio = "username"
[[menu.main]]
@ -60,3 +65,8 @@ pygmentCodeFences = true
parent = "samples"
name = "Test Markdown"
url = "/post/2015-02-20-test-markdown"
[[menu.main]]
name = "Tags"
url = "/tags"
weight = 3

View file

@ -2,6 +2,7 @@
title: Test markdown
subtitle: Each post also has a subtitle
date: 2015-02-20
tags: ["example", "markdown"]
---
You can write regular [markdown](http://markdowntutorial.com/) here and Jekyll will automatically convert it to a nice webpage. I strongly encourage you to [take 5 minutes to learn how to write in markdown](http://markdowntutorial.com/) - it'll teach you how to transform regular text into bold/italics/headings/tables/etc.
@ -49,4 +50,4 @@ var foo = function(x) {
return(x + 5);
}
foo(3)
{{</ highlight >}}
{{</ highlight >}}

View file

@ -2,6 +2,7 @@
title: Code Sample
subtitle: Using Pygments or Highlight.js
date: 2016-03-08
tags: ["example", "code"]
---
The following are two code samples using syntax highlighting.
@ -27,4 +28,4 @@ The following is a code sample using triple backticks ( ``` ) code fencing provi
num2 = prompt("Enter second number")
sum = parseInt(num1) + parseInt(num2) // "+" means "add"
alert("Sum = " + sum) // "+" means combine into a string
```
```