From c98486feb67de386288e44251e1be30e9f04a326 Mon Sep 17 00:00:00 2001 From: Adilson Carvalho Date: Fri, 21 Feb 2014 19:41:05 +0000 Subject: [PATCH 1/4] Added support for bootstrap-sass --- jekyll-assets.gemspec | 1 + lib/jekyll-assets/bootstrap.rb | 7 +++++++ spec/lib/jekyll-assets/bootstrap_spec.rb | 11 +++++++++++ 3 files changed, 19 insertions(+) create mode 100644 lib/jekyll-assets/bootstrap.rb create mode 100644 spec/lib/jekyll-assets/bootstrap_spec.rb diff --git a/jekyll-assets.gemspec b/jekyll-assets.gemspec index f320227d..76163959 100644 --- a/jekyll-assets.gemspec +++ b/jekyll-assets.gemspec @@ -33,4 +33,5 @@ Gem::Specification.new do |spec| spec.add_development_dependency "compass" spec.add_development_dependency "bourbon" spec.add_development_dependency "neat" + spec.add_development_dependency "bootstrap-sass" end diff --git a/lib/jekyll-assets/bootstrap.rb b/lib/jekyll-assets/bootstrap.rb new file mode 100644 index 00000000..ee98a853 --- /dev/null +++ b/lib/jekyll-assets/bootstrap.rb @@ -0,0 +1,7 @@ +require "sprockets" + + +bootstrap = Gem::Specification.find_by_name("bootstrap-sass").gem_dir +%w(fonts javascripts stylesheets).each do |asset| + Sprockets.append_path File.join(bootstrap, 'vendor', 'assets', asset) +end diff --git a/spec/lib/jekyll-assets/bootstrap_spec.rb b/spec/lib/jekyll-assets/bootstrap_spec.rb new file mode 100644 index 00000000..ab9402a4 --- /dev/null +++ b/spec/lib/jekyll-assets/bootstrap_spec.rb @@ -0,0 +1,11 @@ +require "spec_helper" +require "jekyll-assets/bootstrap" + + +module Jekyll::AssetsPlugin + describe "Bootstrap integration" do + it "should globally append bootstrap paths into Sprockets environment" do + @site.assets["vendor/bootstrap.css"].to_s.should =~ /bootstrap\// + end + end +end From f4ace97ee9c0ac650db4b1d54c3d659bbab30f11 Mon Sep 17 00:00:00 2001 From: Adilson Carvalho Date: Fri, 21 Feb 2014 22:13:34 +0000 Subject: [PATCH 2/4] Fixed the test --- spec/lib/jekyll-assets/bootstrap_spec.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spec/lib/jekyll-assets/bootstrap_spec.rb b/spec/lib/jekyll-assets/bootstrap_spec.rb index ab9402a4..b58d4b59 100644 --- a/spec/lib/jekyll-assets/bootstrap_spec.rb +++ b/spec/lib/jekyll-assets/bootstrap_spec.rb @@ -1,11 +1,11 @@ require "spec_helper" require "jekyll-assets/bootstrap" - +require 'pry' module Jekyll::AssetsPlugin describe "Bootstrap integration" do it "should globally append bootstrap paths into Sprockets environment" do - @site.assets["vendor/bootstrap.css"].to_s.should =~ /bootstrap\// + @site.assets["bootstrap.css"].to_s.should =~ /bootstrap\// end end end From 65a9203d1e268b218723d52825f72aa82cff6047 Mon Sep 17 00:00:00 2001 From: Adilson Carvalho Date: Fri, 21 Feb 2014 19:21:31 -0300 Subject: [PATCH 3/4] Update bootstrap_spec.rb --- spec/lib/jekyll-assets/bootstrap_spec.rb | 1 - 1 file changed, 1 deletion(-) diff --git a/spec/lib/jekyll-assets/bootstrap_spec.rb b/spec/lib/jekyll-assets/bootstrap_spec.rb index b58d4b59..e6c7685d 100644 --- a/spec/lib/jekyll-assets/bootstrap_spec.rb +++ b/spec/lib/jekyll-assets/bootstrap_spec.rb @@ -1,7 +1,6 @@ require "spec_helper" require "jekyll-assets/bootstrap" -require 'pry' module Jekyll::AssetsPlugin describe "Bootstrap integration" do it "should globally append bootstrap paths into Sprockets environment" do From 463823419225f931f5a4afae23ab60cdfd336700 Mon Sep 17 00:00:00 2001 From: Adilson Carvalho Date: Fri, 21 Feb 2014 22:52:04 +0000 Subject: [PATCH 4/4] Added documentation --- README.md | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/README.md b/README.md index 2776ac22..c0f7188c 100644 --- a/README.md +++ b/README.md @@ -301,6 +301,18 @@ Now you can add `@import "compass"` in your SASS assets to get Compass goodies. you must require them BEFORE `jekyll-assets/compass`. +#### Bootstrap Support + +Require `jekyll-assets/bootstrap` to enable, e.g.: + +``` ruby +require "jekyll-assets" +require "jekyll-assets/bootstrap" +``` + +Now you can add `@import "bootstrap"` in your SASS assets to get Bootstrap goodies. + + #### Bourbon Support Require `jekyll-assets/bourbon` to enable, e.g.: