Minor edits and fixes to improve compatibility with Jekyll v3.0.0

jekyllt · Oct 30, 2015 · 42688db · 42688db
1 parent 59965b9
commit 42688db
Show file tree

Hide file tree

Showing 16 changed files with 36 additions and 18 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,3 +2,4 @@
 *.swp
 .sass-cache
 .idea
+.jekyll-metadata
diff --git a/README.md b/README.md
@@ -52,6 +52,12 @@ This is exactly what I have done for the generating the live demo.
 Simply clone this repository (*master branch*), and then run `jekyll serve` inside the directory. Upload the resulting 
 _site/ contents to your repository (*gh-pages branch*).
 
+## Issues and contributing 
+
+I have tested this install with Ruby v2.2.2p95 (Mac OS RVM) and Jekyll v3.0.0. If you run into any issues please log them on the [issue tracker](https://github.com/biomadeira/jasper/issues).
+
+Feel free pull-request your patches and fixes.
+
 ## Thanks 
 
 Most of the work has been already done by the Ghost team and Rosario. Many thanks to them :smile:

diff --git a/_config.yml b/_config.yml
@@ -1,4 +1,3 @@
-
 # Website info
 name: 'Finding The Way Home'
 description: "A beautiful narrative written with the world's most elegant publishing platform. The story begins here."
@@ -27,6 +26,11 @@ permalink: /:title
 # permalink: /author/:username
 # permalink: /tag/:tag
 
+
+# gems and other configs
+gems: [jekyll-paginate]
+exclude: [vendor]
+
 # Additional settings available on the front-matter
 # Site logo in the index.html (as in demo.ghost.io)
 # Author's page cover in _layouts/author.html

diff --git a/_plugins/jekyll-rssgenerator.rb b/_plugins/jekyll-rssgenerator.rb
@@ -46,13 +46,13 @@ def generate(site)
         maker.channel.updated = site.posts.map { |p| p.date  }.max
         maker.channel.copyright = site.config['copyright']
 
-        post_limit = (site.config['rss_post_limit'] - 1 rescue site.posts.count)
+        post_limit = site.config['rss_post_limit'].nil? ? site.posts.count : site.config['rss_post_limit'] - 1
 
         site.posts.reverse[0..post_limit].each do |post|
           maker.items.new_item do |item|
             item.title = post.title
             item.link = "#{site.config['url']}#{post.url}"
-            item.description = parser.convert(post.excerpt)
+            item.description = post.excerpt
             item.updated = post.date
           end
         end

diff --git a/_site/README.md b/_site/README.md
@@ -52,6 +52,12 @@ This is exactly what I have done for the generating the live demo.
 Simply clone this repository (*master branch*), and then run `jekyll serve` inside the directory. Upload the resulting 
 _site/ contents to your repository (*gh-pages branch*).
 
+## Issues and contributing 
+
+I have tested this install with Ruby v2.2.2p95 (Mac OS RVM) and Jekyll v3.0.0. If you run into any issues please log them on the [issue tracker](https://github.com/biomadeira/jasper/issues).
+
+Feel free pull-request your patches and fixes.
+
 ## Thanks 
 
 Most of the work has been already done by the Ghost team and Rosario. Many thanks to them :smile:

diff --git a/...l-and-comprehensive-style-test/index.html → .../a-full-and-comprehensive-style-test.html b/...l-and-comprehensive-style-test/index.html → .../a-full-and-comprehensive-style-test.html
@@ -27,7 +27,7 @@
     <link rel="stylesheet" type="text/css" href="/jasper/assets/css/main.css" />
 
 </head>
-<body class="post-template">
+<body class="home-template">
 
     <!-- [[! Everything else gets inserted here ]] -->
     <!-- < default -->
@@ -190,11 +190,11 @@ <h3 id="code">Code</h3>
 
 <p>Code can be presented inline, like <code>&lt;?php bloginfo('stylesheet_url'); ?&gt;</code>, or within a <code>&lt;pre&gt;</code> block. Because we have more specific typographic needs for code, we’ll specify Consolas and Monaco ahead of the browser-defined monospace font.</p>
 
-<div class="highlight"><pre><code class="language-css" data-lang="css"><span class="nf">#container</span> <span class="p">{</span>
+<figure class="highlight"><pre><code class="language-css" data-lang="css"><span class="nf">#container</span> <span class="p">{</span>
     <span class="k">float</span><span class="o">:</span> <span class="k">left</span><span class="p">;</span>
     <span class="k">margin</span><span class="o">:</span> <span class="m">0</span> <span class="m">-240px</span> <span class="m">0</span> <span class="m">0</span><span class="p">;</span>
     <span class="k">width</span><span class="o">:</span> <span class="m">100%</span><span class="p">;</span>
-<span class="p">}</span></code></pre></div>
+<span class="p">}</span></code></pre></figure>
 
 <hr />
 

diff --git a/_site/author/casper/rss.xml b/_site/author/casper/rss.xml
@@ -136,11 +136,11 @@
 
 <p>Code can be presented inline, like <code>&lt;?php bloginfo('stylesheet_url'); ?&gt;</code>, or within a <code>&lt;pre&gt;</code> block. Because we have more specific typographic needs for code, we’ll specify Consolas and Monaco ahead of the browser-defined monospace font.</p>
 
-<div class="highlight"><pre><code class="language-css" data-lang="css"><span class="nf">#container</span> <span class="p">{</span>
+<figure class="highlight"><pre><code class="language-css" data-lang="css"><span class="nf">#container</span> <span class="p">{</span>
     <span class="k">float</span><span class="o">:</span> <span class="k">left</span><span class="p">;</span>
     <span class="k">margin</span><span class="o">:</span> <span class="m">0</span> <span class="m">-240px</span> <span class="m">0</span> <span class="m">0</span><span class="p">;</span>
     <span class="k">width</span><span class="o">:</span> <span class="m">100%</span><span class="p">;</span>
-<span class="p">}</span></code></pre></div>
+<span class="p">}</span></code></pre></figure>
 
 <hr />
 

diff --git a/_site/down-the-rabbit-hole/index.html → _site/down-the-rabbit-hole.html b/_site/down-the-rabbit-hole/index.html → _site/down-the-rabbit-hole.html
@@ -27,7 +27,7 @@
     <link rel="stylesheet" type="text/css" href="/jasper/assets/css/main.css" />
 
 </head>
-<body class="post-template">
+<body class="home-template">
 
     <!-- [[! Everything else gets inserted here ]] -->
     <!-- < default -->

diff --git a/_site/gettysburg-address/index.html → _site/gettysburg-address.html b/_site/gettysburg-address/index.html → _site/gettysburg-address.html
@@ -27,7 +27,7 @@
     <link rel="stylesheet" type="text/css" href="/jasper/assets/css/main.css" />
 
 </head>
-<body class="post-template">
+<body class="home-template">
 
     <!-- [[! Everything else gets inserted here ]] -->
     <!-- < default -->

diff --git a/_site/i-have-a-dream/index.html → _site/i-have-a-dream.html b/_site/i-have-a-dream/index.html → _site/i-have-a-dream.html
@@ -27,7 +27,7 @@
     <link rel="stylesheet" type="text/css" href="/jasper/assets/css/main.css" />
 
 </head>
-<body class="post-template">
+<body class="home-template">
 
     <!-- [[! Everything else gets inserted here ]] -->
     <!-- < default -->

diff --git a/_site/looking-glass-house/index.html → _site/looking-glass-house.html b/_site/looking-glass-house/index.html → _site/looking-glass-house.html
@@ -27,7 +27,7 @@
     <link rel="stylesheet" type="text/css" href="/jasper/assets/css/main.css" />
 
 </head>
-<body class="post-template">
+<body class="home-template">
 
     <!-- [[! Everything else gets inserted here ]] -->
     <!-- < default -->

diff --git a/_site/out-to-sea/index.html → _site/out-to-sea.html b/_site/out-to-sea/index.html → _site/out-to-sea.html
@@ -27,7 +27,7 @@
     <link rel="stylesheet" type="text/css" href="/jasper/assets/css/main.css" />
 
 </head>
-<body class="post-template">
+<body class="home-template">
 
     <!-- [[! Everything else gets inserted here ]] -->
     <!-- < default -->

diff --git a/_site/rss.xml b/_site/rss.xml
@@ -13,6 +13,7 @@
       <title>A Full and Comprehensive Style Test</title>
       <link>http://biomadeira.github.io/jasper//a-full-and-comprehensive-style-test</link>
       <description>&lt;p&gt;This is just an &lt;em&gt;ipsis verbis&lt;/em&gt; copy of the first example running on the &lt;a href=&quot;http://demo.ghost.io&quot;&gt;Ghost Demo&lt;/a&gt;. This shows how you can use html styling to achieve your hopes.&lt;/p&gt;
+
 </description>
       <pubDate>Sat, 27 Sep 2014 11:18:00 +0100</pubDate>
       <dc:date>2014-09-27T11:18:00+01:00</dc:date>

diff --git a/_site/tag/content/rss.xml b/_site/tag/content/rss.xml
@@ -136,11 +136,11 @@
 
 <p>Code can be presented inline, like <code>&lt;?php bloginfo('stylesheet_url'); ?&gt;</code>, or within a <code>&lt;pre&gt;</code> block. Because we have more specific typographic needs for code, we’ll specify Consolas and Monaco ahead of the browser-defined monospace font.</p>
 
-<div class="highlight"><pre><code class="language-css" data-lang="css"><span class="nf">#container</span> <span class="p">{</span>
+<figure class="highlight"><pre><code class="language-css" data-lang="css"><span class="nf">#container</span> <span class="p">{</span>
     <span class="k">float</span><span class="o">:</span> <span class="k">left</span><span class="p">;</span>
     <span class="k">margin</span><span class="o">:</span> <span class="m">0</span> <span class="m">-240px</span> <span class="m">0</span> <span class="m">0</span><span class="p">;</span>
     <span class="k">width</span><span class="o">:</span> <span class="m">100%</span><span class="p">;</span>
-<span class="p">}</span></code></pre></div>
+<span class="p">}</span></code></pre></figure>
 
 <hr />
 

diff --git a/_site/tag/test/rss.xml b/_site/tag/test/rss.xml
@@ -136,11 +136,11 @@
 
 <p>Code can be presented inline, like <code>&lt;?php bloginfo('stylesheet_url'); ?&gt;</code>, or within a <code>&lt;pre&gt;</code> block. Because we have more specific typographic needs for code, we’ll specify Consolas and Monaco ahead of the browser-defined monospace font.</p>
 
-<div class="highlight"><pre><code class="language-css" data-lang="css"><span class="nf">#container</span> <span class="p">{</span>
+<figure class="highlight"><pre><code class="language-css" data-lang="css"><span class="nf">#container</span> <span class="p">{</span>
     <span class="k">float</span><span class="o">:</span> <span class="k">left</span><span class="p">;</span>
     <span class="k">margin</span><span class="o">:</span> <span class="m">0</span> <span class="m">-240px</span> <span class="m">0</span> <span class="m">0</span><span class="p">;</span>
     <span class="k">width</span><span class="o">:</span> <span class="m">100%</span><span class="p">;</span>
-<span class="p">}</span></code></pre></div>
+<span class="p">}</span></code></pre></figure>
 
 <hr />
 

diff --git a/_site/the-purpose-of-education/index.html → _site/the-purpose-of-education.html b/_site/the-purpose-of-education/index.html → _site/the-purpose-of-education.html
@@ -27,7 +27,7 @@
     <link rel="stylesheet" type="text/css" href="/jasper/assets/css/main.css" />
 
 </head>
-<body class="post-template">
+<body class="home-template">
 
     <!-- [[! Everything else gets inserted here ]] -->
     <!-- < default -->
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,3 +2,4 @@ @@
     *.swp
     .sass-cache
     .idea
+    .jekyll-metadata