Merge branch 'master' of github.com:epwalsh/beautiful-jekyll

This commit is contained in:
Pete 2016-07-29 23:09:42 -05:00
commit 819a437c26
2 changed files with 13 additions and 10 deletions

View File

@ -183,6 +183,7 @@ Want your website featured here? [Contact me](http://deanattali.com/aboutme#cont
| [chauff.github.io](http://chauff.github.io/) | Claudia Hauff | Professor at Delft University of Technology | | [chauff.github.io](http://chauff.github.io/) | Claudia Hauff | Professor at Delft University of Technology |
| [kootenpv.github.io](http://kootenpv.github.io/) | Pascal van Kooten | Data analytics | | [kootenpv.github.io](http://kootenpv.github.io/) | Pascal van Kooten | Data analytics |
| [sjackman.ca](http://sjackman.ca) | Shaun Jackman | PhD candidate in bioinformatics | | [sjackman.ca](http://sjackman.ca) | Shaun Jackman | PhD candidate in bioinformatics |
| [epwalsh.fyi](https://epwalsh.fyi) | Evan Pete Walsh | PhD candidate (Statistics and Mathematics) at Iowa State University |
### Very advanced: Local development ### Very advanced: Local development

View File

@ -22,16 +22,18 @@ Here's a useless table:
How about a yummy crepe? How about a yummy crepe?
![Crepe](http://lafenicegelato.com/wp-content/uploads/2014/09/crepes-with-chocolate.jpg) ![Crepe](http://s3-media3.fl.yelpcdn.com/bphoto/cQ1Yoa75m2yUFFbY2xwuqw/348s.jpg)
Here's a code chunk: Here's a code chunk:
~~~ ~~~
x <- 5 + 10 var foo = function(x) {
print(x) return(x + 5);
}
foo(3)
~~~ ~~~
And here is some code with syntax highlighting And here is the same code with syntax highlighting:
```javascript ```javascript
var foo = function(x) { var foo = function(x) {
@ -40,11 +42,11 @@ var foo = function(x) {
foo(3) foo(3)
``` ```
And here is some more with line numbers And here is the same code yet again but with line numbers:
{% highlight python linenos %} {% highlight javascript linenos %}
def bar(x): var foo = function(x) {
return x * 2 return(x + 5);
}
print bar(2) foo(3)
{% endhighlight %} {% endhighlight %}