Skip to content

Commit d318eaf

Browse files
author
Jordan McCullough
committed
Merge pull request #257 from github/jekyll-sass
Jekyll Sass compiling support
2 parents 4cd2e24 + 2a4404e commit d318eaf

File tree

83 files changed

+93
-5655
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

83 files changed

+93
-5655
lines changed

Gemfile

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
11
source "https://rubygems.org"
22

3-
gem 'compass'
43
gem 'github-pages'
54
gem 'html-proofer'
6-
gem 'jekyll'
75
gem 'rack-contrib', '~> 1.1.0'
86
gem 'rake'
97
gem 'rdiscount'
10-
gem 'sass'

Gemfile.lock

Lines changed: 85 additions & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -2,124 +2,138 @@ GEM
22
remote: https://rubygems.org/
33
specs:
44
RedCloth (4.2.9)
5-
activesupport (4.1.0)
5+
activesupport (4.1.6)
66
i18n (~> 0.6, >= 0.6.9)
77
json (~> 1.7, >= 1.7.7)
88
minitest (~> 5.1)
99
thread_safe (~> 0.1)
1010
tzinfo (~> 1.1)
1111
blankslate (2.1.2.4)
12-
chunky_png (1.3.1)
13-
classifier (1.3.4)
14-
fast-stemmer (>= 1.0.0)
12+
celluloid (0.16.0)
13+
timers (~> 4.0.0)
14+
classifier-reborn (2.0.1)
15+
fast-stemmer (~> 1.0)
16+
coffee-script (2.3.0)
17+
coffee-script-source
18+
execjs
19+
coffee-script-source (1.8.0)
1520
colorator (0.1)
1621
colored (1.2)
17-
commander (4.1.6)
18-
highline (~> 1.6.11)
19-
compass (0.12.6)
20-
chunky_png (~> 1.2)
21-
fssm (>= 0.2.7)
22-
sass (~> 3.2.19)
23-
ethon (0.7.0)
22+
ethon (0.7.1)
2423
ffi (>= 1.3.0)
24+
execjs (2.2.2)
2525
fast-stemmer (1.0.2)
26-
ffi (1.9.3)
27-
fssm (0.2.10)
28-
gemoji (1.5.0)
29-
github-pages (18)
26+
ffi (1.9.6)
27+
gemoji (2.1.0)
28+
github-pages (28)
3029
RedCloth (= 4.2.9)
31-
jekyll (= 1.5.1)
32-
jekyll-mentions (= 0.0.6)
33-
jekyll-redirect-from (= 0.3.1)
34-
jekyll-sitemap (= 0.2.0)
35-
jemoji (= 0.1.0)
30+
jekyll (= 2.4.0)
31+
jekyll-coffeescript (= 1.0.0)
32+
jekyll-mentions (= 0.1.3)
33+
jekyll-redirect-from (= 0.6.2)
34+
jekyll-sass-converter (= 1.2.0)
35+
jekyll-sitemap (= 0.6.0)
36+
jemoji (= 0.3.0)
3637
kramdown (= 1.3.1)
37-
liquid (= 2.5.5)
38+
liquid (= 2.6.1)
3839
maruku (= 0.7.0)
40+
pygments.rb (= 0.6.0)
3941
rdiscount (= 2.1.7)
40-
redcarpet (= 2.3.0)
41-
highline (1.6.21)
42-
html-pipeline (1.5.0)
42+
redcarpet (= 3.1.2)
43+
hitimes (1.2.2)
44+
html-pipeline (1.9.0)
4345
activesupport (>= 2)
4446
nokogiri (~> 1.4)
45-
html-proofer (0.6.7)
47+
html-proofer (1.4.0)
4648
colored (~> 1.2)
4749
mercenary (~> 0.3.2)
48-
nokogiri (~> 1.6.0)
50+
nokogiri (~> 1.5)
51+
parallel (~> 1.3)
4952
typhoeus (~> 0.6.7)
50-
i18n (0.6.9)
51-
jekyll (1.5.1)
52-
classifier (~> 1.3)
53+
yell (~> 2.0)
54+
i18n (0.6.11)
55+
jekyll (2.4.0)
56+
classifier-reborn (~> 2.0)
5357
colorator (~> 0.1)
54-
commander (~> 4.1.3)
55-
liquid (~> 2.5.5)
56-
listen (~> 1.3)
57-
maruku (= 0.7.0)
58-
pygments.rb (~> 0.5.0)
59-
redcarpet (~> 2.3.0)
58+
jekyll-coffeescript (~> 1.0)
59+
jekyll-gist (~> 1.0)
60+
jekyll-paginate (~> 1.0)
61+
jekyll-sass-converter (~> 1.0)
62+
jekyll-watch (~> 1.1)
63+
kramdown (~> 1.3)
64+
liquid (~> 2.6.1)
65+
mercenary (~> 0.3.3)
66+
pygments.rb (~> 0.6.0)
67+
redcarpet (~> 3.1)
6068
safe_yaml (~> 1.0)
6169
toml (~> 0.1.0)
62-
jekyll-mentions (0.0.6)
63-
html-pipeline (~> 1.5.0)
64-
jekyll (~> 1.4)
65-
jekyll-redirect-from (0.3.1)
66-
jekyll (~> 1.4)
67-
jekyll-sitemap (0.2.0)
68-
jekyll (~> 1.4)
69-
jemoji (0.1.0)
70-
gemoji (~> 1.5.0)
71-
html-pipeline (~> 1.5.0)
72-
jekyll (~> 1.4)
70+
jekyll-coffeescript (1.0.0)
71+
coffee-script (~> 2.2)
72+
jekyll-gist (1.1.0)
73+
jekyll-mentions (0.1.3)
74+
html-pipeline (~> 1.9.0)
75+
jekyll (~> 2.0)
76+
jekyll-paginate (1.1.0)
77+
jekyll-redirect-from (0.6.2)
78+
jekyll (~> 2.0)
79+
jekyll-sass-converter (1.2.0)
80+
sass (~> 3.2)
81+
jekyll-sitemap (0.6.0)
82+
jekyll-watch (1.1.1)
83+
listen (~> 2.7)
84+
jemoji (0.3.0)
85+
gemoji (~> 2.0)
86+
html-pipeline (~> 1.9)
87+
jekyll (~> 2.0)
7388
json (1.8.1)
7489
kramdown (1.3.1)
75-
liquid (2.5.5)
76-
listen (1.3.1)
90+
liquid (2.6.1)
91+
listen (2.7.11)
92+
celluloid (>= 0.15.2)
7793
rb-fsevent (>= 0.9.3)
7894
rb-inotify (>= 0.9)
79-
rb-kqueue (>= 0.2)
8095
maruku (0.7.0)
81-
mercenary (0.3.2)
82-
mini_portile (0.5.3)
83-
minitest (5.3.3)
84-
nokogiri (1.6.1)
85-
mini_portile (~> 0.5.0)
96+
mercenary (0.3.4)
97+
mini_portile (0.6.0)
98+
minitest (5.4.2)
99+
nokogiri (1.6.3.1)
100+
mini_portile (= 0.6.0)
101+
parallel (1.3.3)
86102
parslet (1.5.0)
87103
blankslate (~> 2.0)
88-
posix-spawn (0.3.8)
89-
pygments.rb (0.5.4)
104+
posix-spawn (0.3.9)
105+
pygments.rb (0.6.0)
90106
posix-spawn (~> 0.3.6)
91107
yajl-ruby (~> 1.1.0)
92108
rack (1.5.2)
93109
rack-contrib (1.1.0)
94110
rack (>= 0.9.1)
95-
rake (10.3.1)
111+
rake (10.3.2)
96112
rb-fsevent (0.9.4)
97-
rb-inotify (0.9.4)
98-
ffi (>= 0.5.0)
99-
rb-kqueue (0.2.2)
113+
rb-inotify (0.9.5)
100114
ffi (>= 0.5.0)
101115
rdiscount (2.1.7)
102-
redcarpet (2.3.0)
103-
safe_yaml (1.0.3)
104-
sass (3.2.19)
105-
thread_safe (0.3.3)
106-
toml (0.1.1)
116+
redcarpet (3.1.2)
117+
safe_yaml (1.0.4)
118+
sass (3.4.6)
119+
thread_safe (0.3.4)
120+
timers (4.0.1)
121+
hitimes
122+
toml (0.1.2)
107123
parslet (~> 1.5.0)
108-
typhoeus (0.6.8)
109-
ethon (>= 0.7.0)
110-
tzinfo (1.1.0)
124+
typhoeus (0.6.9)
125+
ethon (>= 0.7.1)
126+
tzinfo (1.2.2)
111127
thread_safe (~> 0.1)
112128
yajl-ruby (1.1.0)
129+
yell (2.0.5)
113130

114131
PLATFORMS
115132
ruby
116133

117134
DEPENDENCIES
118-
compass
119135
github-pages
120136
html-proofer
121-
jekyll
122137
rack-contrib (~> 1.1.0)
123138
rake
124139
rdiscount
125-
sass

_config.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,5 +26,9 @@ include:
2626

2727
markdown: rdiscount
2828

29+
sass:
30+
sass_dir: dependencies/bootstrap-sass/assets/stylesheets/
31+
style: :compressed
32+
2933
# Custom site configuration
3034
lang: en

0 commit comments

Comments
 (0)