Skip to content

Commit 523f992

Browse files
itomblackitomblack
authored andcommitted
Merge branch 'gg/autoprefix'
# Conflicts: # _layouts/work.html
2 parents 81c6cd5 + c6b4cfc commit 523f992

File tree

3 files changed

+13
-0
lines changed

3 files changed

+13
-0
lines changed

Gemfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,5 @@ source 'https://rubygems.org'
22

33
gem 'jekyll', '~> 2.5.3'
44
gem 'jekyll-paginate'
5+
gem 'octopress-autoprefixer'
6+

Gemfile.lock

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4+
autoprefixer-rails (6.3.3.1)
5+
execjs
46
blankslate (2.1.2.4)
57
celluloid (0.16.0)
68
timers (~> 4.0.0)
@@ -45,6 +47,12 @@ GEM
4547
rb-fsevent (>= 0.9.3)
4648
rb-inotify (>= 0.9)
4749
mercenary (0.3.5)
50+
octopress-autoprefixer (1.0.2)
51+
autoprefixer-rails
52+
jekyll (>= 2.0)
53+
octopress-hooks (~> 2.0)
54+
octopress-hooks (2.6.1)
55+
jekyll (>= 2.0)
4856
parslet (1.5.0)
4957
blankslate (~> 2.0)
5058
posix-spawn (0.3.11)
@@ -69,6 +77,7 @@ PLATFORMS
6977
DEPENDENCIES
7078
jekyll (~> 2.5.3)
7179
jekyll-paginate
80+
octopress-autoprefixer
7281

7382
BUNDLED WITH
7483
1.11.2

_config.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,3 +34,5 @@ defaults:
3434
analytics_category: "blog"
3535

3636
gems: [jekyll-paginate]
37+
gems:
38+
- octopress-autoprefixer

0 commit comments

Comments
 (0)