From 0cb36084ac69b753056046bb3a360cfbcd0831eb Mon Sep 17 00:00:00 2001 From: Vjeux Date: Mon, 3 Jun 2013 00:48:15 +0200 Subject: [PATCH 1/4] Initial version of the blog --- _includes/blog_post.html | 10 ++++++++++ _layouts/blog.html | 13 +++++++++++++ _layouts/default.html | 1 + _layouts/post.html | 10 ++++------ _posts/2013-06-02-jsfiddle-integration.md | 10 ++++++++++ blog.md | 5 +++++ 6 files changed, 43 insertions(+), 6 deletions(-) create mode 100644 _includes/blog_post.html create mode 100644 _layouts/blog.html create mode 100644 _posts/2013-06-02-jsfiddle-integration.md create mode 100644 blog.md diff --git a/_includes/blog_post.html b/_includes/blog_post.html new file mode 100644 index 00000000..264a2b28 --- /dev/null +++ b/_includes/blog_post.html @@ -0,0 +1,10 @@ +

{{ page.title }}

+

{{ page.date | date_to_string }} by {{ page.author }}

+ +
+{% if content != '' %} + {{ content }} +{% else %} + {{ page.content }} +{% endif %} +
diff --git a/_layouts/blog.html b/_layouts/blog.html new file mode 100644 index 00000000..a9e04512 --- /dev/null +++ b/_layouts/blog.html @@ -0,0 +1,13 @@ +--- +layout: default +sectionid: blog +--- + +
+
+ {% for page in site.posts %} + {% include blog_post.html %} + {% endfor %} +
+
+ diff --git a/_layouts/default.html b/_layouts/default.html index 019c0d10..d12322c3 100644 --- a/_layouts/default.html +++ b/_layouts/default.html @@ -41,6 +41,7 @@
  • docs
  • support
  • download
    • +
  • blog
  • github diff --git a/_layouts/post.html b/_layouts/post.html index 822eadba..1ac4e4f0 100644 --- a/_layouts/post.html +++ b/_layouts/post.html @@ -1,12 +1,10 @@ --- layout: default +sectionid: blog --- -
    -

    {{ page.title }}

    -

    {{ page.date | date_to_string }}

    - -
    - {{ content }} +
    +
    + {% include blog_post.html %}
    diff --git a/_posts/2013-06-02-jsfiddle-integration.md b/_posts/2013-06-02-jsfiddle-integration.md new file mode 100644 index 00000000..acd5a893 --- /dev/null +++ b/_posts/2013-06-02-jsfiddle-integration.md @@ -0,0 +1,10 @@ +--- +title: JSFiddle Integration +layout: post +author: Vjeux +--- + +[JSFiddle](http://jsfiddle.net) just announced support for React. This is an exciting news as it makes collaboration on snippets of code a lot easier. You can play around this **[base React JSFiddle](http://jsfiddle.net/vjeux/25Rhk/)**, fork it and share it! + + + \ No newline at end of file diff --git a/blog.md b/blog.md new file mode 100644 index 00000000..03725e6c --- /dev/null +++ b/blog.md @@ -0,0 +1,5 @@ +--- +id: blog +title: Blog +layout: blog +--- From ed0a3a44acc949462c65de5cb511fad77d5d5b80 Mon Sep 17 00:00:00 2001 From: Vjeux Date: Mon, 3 Jun 2013 01:03:57 +0200 Subject: [PATCH 2/4] Adding a left menu navigation --- _includes/blog_post.html | 2 +- _includes/nav_blog.html | 10 ++++++++++ _layouts/blog.html | 3 ++- _layouts/post.html | 3 ++- 4 files changed, 15 insertions(+), 3 deletions(-) create mode 100644 _includes/nav_blog.html diff --git a/_includes/blog_post.html b/_includes/blog_post.html index 264a2b28..508a13b3 100644 --- a/_includes/blog_post.html +++ b/_includes/blog_post.html @@ -1,4 +1,4 @@ -

    {{ page.title }}

    +

    {{ page.title }}

    {{ page.date | date_to_string }} by {{ page.author }}

    diff --git a/_includes/nav_blog.html b/_includes/nav_blog.html new file mode 100644 index 00000000..ba376a18 --- /dev/null +++ b/_includes/nav_blog.html @@ -0,0 +1,10 @@ +
    +
    +

    Recent posts

    + +
    +
    \ No newline at end of file diff --git a/_layouts/blog.html b/_layouts/blog.html index a9e04512..84be39f5 100644 --- a/_layouts/blog.html +++ b/_layouts/blog.html @@ -3,7 +3,8 @@ layout: default sectionid: blog --- -
    +
    + {% include nav_blog.html %}
    {% for page in site.posts %} {% include blog_post.html %} diff --git a/_layouts/post.html b/_layouts/post.html index 1ac4e4f0..84e7bb2a 100644 --- a/_layouts/post.html +++ b/_layouts/post.html @@ -3,7 +3,8 @@ layout: default sectionid: blog --- -
    +
    + {% include nav_blog.html %}
    {% include blog_post.html %}
    From 69b45799e2759ae40dfd8db58c3b37425df9fbb4 Mon Sep 17 00:00:00 2001 From: Vjeux Date: Mon, 3 Jun 2013 01:06:05 +0200 Subject: [PATCH 3/4] Adding \n at the end of the files --- _includes/nav_blog.html | 2 +- _posts/2013-06-02-jsfiddle-integration.md | 2 +- blog.md | 1 - 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/_includes/nav_blog.html b/_includes/nav_blog.html index ba376a18..3cc9ec8b 100644 --- a/_includes/nav_blog.html +++ b/_includes/nav_blog.html @@ -7,4 +7,4 @@ {% endfor %}
    -
    \ No newline at end of file +
    diff --git a/_posts/2013-06-02-jsfiddle-integration.md b/_posts/2013-06-02-jsfiddle-integration.md index acd5a893..9b7d8f5f 100644 --- a/_posts/2013-06-02-jsfiddle-integration.md +++ b/_posts/2013-06-02-jsfiddle-integration.md @@ -7,4 +7,4 @@ author: Vjeux [JSFiddle](http://jsfiddle.net) just announced support for React. This is an exciting news as it makes collaboration on snippets of code a lot easier. You can play around this **[base React JSFiddle](http://jsfiddle.net/vjeux/25Rhk/)**, fork it and share it! - \ No newline at end of file + diff --git a/blog.md b/blog.md index 03725e6c..b3e64e10 100644 --- a/blog.md +++ b/blog.md @@ -1,5 +1,4 @@ --- -id: blog title: Blog layout: blog --- From 18a1f71d6456330fd88ae4f40ab2c8998284e50a Mon Sep 17 00:00:00 2001 From: Vjeux Date: Mon, 3 Jun 2013 01:28:22 +0200 Subject: [PATCH 4/4] Add a base link without JSX --- _posts/2013-06-02-jsfiddle-integration.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_posts/2013-06-02-jsfiddle-integration.md b/_posts/2013-06-02-jsfiddle-integration.md index 9b7d8f5f..06f45c96 100644 --- a/_posts/2013-06-02-jsfiddle-integration.md +++ b/_posts/2013-06-02-jsfiddle-integration.md @@ -4,7 +4,7 @@ layout: post author: Vjeux --- -[JSFiddle](http://jsfiddle.net) just announced support for React. This is an exciting news as it makes collaboration on snippets of code a lot easier. You can play around this **[base React JSFiddle](http://jsfiddle.net/vjeux/25Rhk/)**, fork it and share it! +[JSFiddle](http://jsfiddle.net) just announced support for React. This is an exciting news as it makes collaboration on snippets of code a lot easier. You can play around this **[base React JSFiddle](http://jsfiddle.net/vjeux/kb3gN/)**, fork it and share it! A [fiddle without JSX](http://jsfiddle.net/vjeux/VkebS/) is also available .