Minimal updates for Jekyll 2.0
Paul O’Shannessy committed
Aug 12, 2014 at 22:44 UTC
77fa3f35b555c203fd7c7519fb004c5bbf7d87bb
6 files changed
+64
-53
.gitignore
-1
@@ -12,7 +12,6 @@ build/
12
docs/code
13
docs/_site
14
docs/.sass-cache
15
-docs/css/react.css
15
docs/js/*
16
docs/downloads
17
examples/shared/*.js
docs/Gemfile
+3
-8
@@ -3,19 +3,14 @@ source 'https://rubygems.org'
3
gem 'rake'
4
5
# jekyll, which builds it all
6
-gem 'jekyll', '~>1.3.0'
6
+# 2.0 includes sass processing
7
+gem 'jekyll', '~>2.0'
8
9
# JSON
10
gem 'json'
11
11
-# SASS for CSS
12
-gem 'sass'
13
-
12
# For `rake watch`
13
gem 'rb-fsevent'
14
17
-# Redcarpet for Markdown
18
-gem 'redcarpet'
19
-
15
# For markdown header cleanup
21
-gem 'sanitize'
16
+gem 'sanitize', '~>2.0'
docs/Gemfile.lock
+53
-35
@@ -1,61 +1,79 @@
1
GEM
2
remote: https://rubygems.org/
3
specs:
4
- classifier (1.3.3)
4
+ blankslate (2.1.2.4)
5
+ celluloid (0.15.2)
6
+ timers (~> 1.1.0)
7
+ classifier (1.3.4)
8
fast-stemmer (>= 1.0.0)
9
+ coffee-script (2.3.0)
10
+ coffee-script-source
11
+ execjs
12
+ coffee-script-source (1.7.1)
13
colorator (0.1)
7
- commander (4.1.5)
8
- highline (~> 1.6.11)
14
+ execjs (2.2.1)
15
fast-stemmer (1.0.2)
16
ffi (1.9.3)
11
- highline (1.6.20)
12
- jekyll (1.3.0)
17
+ jekyll (2.2.0)
18
classifier (~> 1.3)
19
colorator (~> 0.1)
15
- commander (~> 4.1.3)
16
- liquid (~> 2.5.2)
17
- listen (~> 1.3)
18
- maruku (~> 0.6.0)
19
- pygments.rb (~> 0.5.0)
20
- redcarpet (~> 2.3.0)
21
- safe_yaml (~> 0.9.7)
20
+ jekyll-coffeescript (~> 1.0)
21
+ jekyll-gist (~> 1.0)
22
+ jekyll-paginate (~> 1.0)
23
+ jekyll-sass-converter (~> 1.0)
24
+ jekyll-watch (~> 1.0)
25
+ kramdown (~> 1.3)
26
+ liquid (~> 2.6.1)
27
+ mercenary (~> 0.3.3)
28
+ pygments.rb (~> 0.6.0)
29
+ redcarpet (~> 3.1)
30
+ safe_yaml (~> 1.0)
31
+ toml (~> 0.1.0)
32
+ jekyll-coffeescript (1.0.0)
33
+ coffee-script (~> 2.2)
34
+ jekyll-gist (1.1.0)
35
+ jekyll-paginate (1.0.0)
36
+ jekyll-sass-converter (1.2.0)
37
+ sass (~> 3.2)
38
+ jekyll-watch (1.1.0)
39
+ listen (~> 2.7)
40
json (1.8.1)
23
- liquid (2.5.4)
24
- listen (1.3.1)
41
+ kramdown (1.4.1)
42
+ liquid (2.6.1)
43
+ listen (2.7.9)
44
+ celluloid (>= 0.15.2)
45
rb-fsevent (>= 0.9.3)
46
rb-inotify (>= 0.9)
27
- rb-kqueue (>= 0.2)
28
- maruku (0.6.1)
29
- syntax (>= 1.0.0)
30
- mini_portile (0.5.2)
31
- nokogiri (1.6.0)
32
- mini_portile (~> 0.5.0)
33
- posix-spawn (0.3.6)
34
- pygments.rb (0.5.4)
47
+ mercenary (0.3.4)
48
+ mini_portile (0.6.0)
49
+ nokogiri (1.6.3.1)
50
+ mini_portile (= 0.6.0)
51
+ parslet (1.5.0)
52
+ blankslate (~> 2.0)
53
+ posix-spawn (0.3.9)
54
+ pygments.rb (0.6.0)
55
posix-spawn (~> 0.3.6)
56
yajl-ruby (~> 1.1.0)
37
- rake (10.1.0)
38
- rb-fsevent (0.9.3)
39
- rb-inotify (0.9.2)
57
+ rake (10.3.2)
58
+ rb-fsevent (0.9.4)
59
+ rb-inotify (0.9.5)
60
ffi (>= 0.5.0)
41
- rb-kqueue (0.2.0)
42
- ffi (>= 0.5.0)
43
- redcarpet (2.3.0)
44
- safe_yaml (0.9.7)
61
+ redcarpet (3.1.2)
62
+ safe_yaml (1.0.3)
63
sanitize (2.0.6)
64
nokogiri (>= 1.4.4)
47
- sass (3.2.12)
48
- syntax (1.0.0)
65
+ sass (3.3.14)
66
+ timers (1.1.0)
67
+ toml (0.1.1)
68
+ parslet (~> 1.5.0)
69
yajl-ruby (1.1.0)
70
71
PLATFORMS
72
ruby
73
74
DEPENDENCIES
55
- jekyll (~> 1.3.0)
75
+ jekyll (~> 2.0)
76
json
77
rake
78
rb-fsevent
59
- redcarpet
60
- sanitize
61
- sass
79
+ sanitize (~> 2.0)
docs/Rakefile
+2
-8
@@ -2,19 +2,13 @@ require('rubygems')
2
require('json')
3
require('yaml')
4
5
-desc "generate css from sass"
6
-task :css do
7
- system "sass --style=compressed _css/react.scss css/react.css"
8
-end
9
-
5
desc "generate js from jsx"
6
task :js do
7
system "../bin/jsx _js js"
8
end
9
15
-desc "watch css & js"
10
+desc "watch js"
11
task :watch do
17
- Process.spawn "sass --style=compressed --watch _css/react.scss:css/react.css"
12
Process.spawn "../bin/jsx --watch _js js"
13
Process.waitall
14
end
@@ -34,4 +28,4 @@ task :release => [:update_version, :default] do
28
system "jekyll build -d ../../react-gh-pages"
29
end
30
37
-task :default => [:css, :js]
31
+task :default => [:js]
docs/_config.yml
+4
-1
@@ -10,7 +10,7 @@ exclude:
10
redcarpet:
11
extensions:
12
- fenced_code_blocks
13
-pygments: true
13
+highlighter: pygments
14
name: React
15
markdown: redcarpet
16
react_version: 0.11.1
@@ -19,3 +19,6 @@ relative_permalinks: true
19
paginate: 5
20
paginate_path: "/blog/page:num/"
21
timezone: America/Los_Angeles
22
+sass:
23
+ style: :compressed
24
+ sass_dir: _css
docs/css/react.scss
renamed
+2
@@ -1,3 +1,5 @@
1
+---
2
+---
3
@import 'bourbon/bourbon';
4
@import '_variables';
5
@import '_typography';