Browse Source

Update to Jekyll 3.0

- Remove Pygments gem and replace with Rouge default
- Git ignore Jekyll metadata file used for incremental rebuild
master
Michael Rose 3 years ago
parent
commit
fe2bbe6bb9

+ 2
- 1
.gitignore View File

@@ -4,4 +4,5 @@ _site
4 4
 *.sublime-workspace
5 5
 codekit-config.json
6 6
 node_modules
7
-.sass-cache
7
+.sass-cache
8
+.jekyll-metadata

+ 2
- 3
Gemfile View File

@@ -1,6 +1,5 @@
1 1
 source 'https://rubygems.org'
2 2
 
3
-gem 'jekyll'
3
+gem 'jekyll', '~> 3.0'
4 4
 gem 'jekyll-sitemap'
5
-gem 'octopress', '~> 3.0.0.rc.12'
6
-gem 'rouge'
5
+gem 'octopress', '~> 3.0'

+ 23
- 57
Gemfile.lock View File

@@ -1,91 +1,57 @@
1 1
 GEM
2 2
   remote: https://rubygems.org/
3 3
   specs:
4
-    blankslate (2.1.2.4)
5
-    celluloid (0.16.0)
6
-      timers (~> 4.0.0)
7
-    classifier-reborn (2.0.3)
8
-      fast-stemmer (~> 1.0)
9
-    coffee-script (2.3.0)
10
-      coffee-script-source
11
-      execjs
12
-    coffee-script-source (1.9.0)
13 4
     colorator (0.1)
14
-    execjs (2.3.0)
15
-    fast-stemmer (1.0.2)
16
-    ffi (1.9.6)
17
-    ffi (1.9.6-x64-mingw32)
18
-    hitimes (1.2.2)
19
-    jekyll (2.5.3)
20
-      classifier-reborn (~> 2.0)
5
+    ffi (1.9.10)
6
+    ffi (1.9.10-x64-mingw32)
7
+    jekyll (3.0.0)
21 8
       colorator (~> 0.1)
22
-      jekyll-coffeescript (~> 1.0)
23
-      jekyll-gist (~> 1.0)
24
-      jekyll-paginate (~> 1.0)
25 9
       jekyll-sass-converter (~> 1.0)
26 10
       jekyll-watch (~> 1.1)
27 11
       kramdown (~> 1.3)
28
-      liquid (~> 2.6.1)
12
+      liquid (~> 3.0)
29 13
       mercenary (~> 0.3.3)
30
-      pygments.rb (~> 0.6.0)
31
-      redcarpet (~> 3.1)
14
+      rouge (~> 1.7)
32 15
       safe_yaml (~> 1.0)
33
-      toml (~> 0.1.0)
34
-    jekyll-coffeescript (1.0.1)
35
-      coffee-script (~> 2.2)
36
-    jekyll-gist (1.1.0)
37
-    jekyll-paginate (1.1.0)
38 16
     jekyll-sass-converter (1.3.0)
39 17
       sass (~> 3.2)
40
-    jekyll-sitemap (0.8.0)
41
-    jekyll-watch (1.2.1)
42
-      listen (~> 2.7)
43
-    kramdown (1.5.0)
44
-    liquid (2.6.2)
45
-    listen (2.8.5)
46
-      celluloid (>= 0.15.2)
18
+    jekyll-sitemap (0.9.0)
19
+    jekyll-watch (1.3.0)
20
+      listen (~> 3.0)
21
+    kramdown (1.9.0)
22
+    liquid (3.0.6)
23
+    listen (3.0.3)
47 24
       rb-fsevent (>= 0.9.3)
48 25
       rb-inotify (>= 0.9)
49 26
     mercenary (0.3.5)
50
-    octopress (3.0.0.rc.33)
51
-      jekyll (~> 2.0)
27
+    octopress (3.0.11)
28
+      jekyll (>= 2.0)
52 29
       mercenary (~> 0.3.2)
53 30
       octopress-deploy
54 31
       octopress-escape-code (~> 2.0)
55 32
       octopress-hooks (~> 2.0)
33
+      redcarpet (~> 3.0)
56 34
       titlecase
57
-    octopress-deploy (1.1.0)
35
+    octopress-deploy (1.3.0)
58 36
       colorator
59 37
     octopress-escape-code (2.0.6)
60 38
       octopress-hooks (~> 2.0)
61
-    octopress-hooks (2.4.1)
62
-      jekyll (~> 2.0)
63
-    parslet (1.5.0)
64
-      blankslate (~> 2.0)
65
-    posix-spawn (0.3.9)
66
-    pygments.rb (0.6.2)
67
-      posix-spawn (~> 0.3.6)
68
-      yajl-ruby (~> 1.2.0)
69
-    rb-fsevent (0.9.4)
39
+    octopress-hooks (2.6.1)
40
+      jekyll (>= 2.0)
41
+    rb-fsevent (0.9.6)
70 42
     rb-inotify (0.9.5)
71 43
       ffi (>= 0.5.0)
72
-    redcarpet (3.2.2)
73
-    rouge (1.8.0)
44
+    redcarpet (3.3.3)
45
+    rouge (1.10.1)
74 46
     safe_yaml (1.0.4)
75
-    sass (3.4.12)
76
-    timers (4.0.1)
77
-      hitimes
47
+    sass (3.4.19)
78 48
     titlecase (0.1.1)
79
-    toml (0.1.2)
80
-      parslet (~> 1.5.0)
81
-    yajl-ruby (1.2.1)
82 49
 
83 50
 PLATFORMS
84 51
   ruby
85 52
   x64-mingw32
86 53
 
87 54
 DEPENDENCIES
88
-  jekyll
55
+  jekyll (~> 3.0)
89 56
   jekyll-sitemap
90
-  octopress (~> 3.0.0.rc.12)
91
-  rouge
57
+  octopress (~> 3.0)

+ 2
- 2
_config.yml View File

@@ -11,7 +11,7 @@ url: http://localhost:4000
11 11
 
12 12
 permalink:   /:categories/:title/
13 13
 markdown:    kramdown
14
-highlighter: pygments
14
+highlighter: rouge
15 15
 sass:
16 16
   sass_dir: _sass
17 17
   style: compressed
@@ -23,7 +23,7 @@ kramdown:
23 23
   footnote_nr: 1
24 24
   entity_output: as_char
25 25
   toc_levels: 1..2
26
-  use_coderay: false
26
+  enable_coderay: false
27 27
 
28 28
 mathjax: true
29 29
 

+ 2
- 2
_posts/articles/2013-08-16-code-highlighting-post.md View File

@@ -16,7 +16,7 @@ Syntax highlighting is a feature that displays source code, in different colors
16 16
 
17 17
 [^1]: <http://en.wikipedia.org/wiki/Syntax_highlighting>
18 18
 
19
-### Pygments or Rouge Code Blocks
19
+### Highlighted Code Blocks
20 20
 
21 21
 To modify styling and highlight colors edit `/_sass/_syntax.scss`.
22 22
 
@@ -117,4 +117,4 @@ module Jekyll
117 117
     end
118 118
   end
119 119
 end
120
-~~~
120
+~~~

+ 1
- 1
_posts/blog/2014-08-08-hello-world.md View File

@@ -3,7 +3,7 @@ layout: post
3 3
 title: "Hello World"
4 4
 modified:
5 5
 categories: blog
6
-excerpt:
6
+excerpt: ""
7 7
 tags: []
8 8
 image:
9 9
   feature:

+ 1
- 1
_posts/blog/2015-08-10-mathjax-example.md View File

@@ -3,7 +3,7 @@ layout: post
3 3
 title: "MathJax Example"
4 4
 modified:
5 5
 categories: blog
6
-excerpt:
6
+excerpt: ""
7 7
 tags: []
8 8
 image:
9 9
   feature:

Loading…
Cancel
Save