kotovalexarian-likes-github/twbs--bootstrap-sass
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap-sass.git synced 2022-11-09 12:27:02 -05:00
Code Releases Activity

Merge branch 'rails_2_3' into 2.0.3

Browse source
This commit is contained in:
Thomas McDonald 2012-04-08 20:00:25 +01:00
commit df308c1b3a
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lib/bootstrap-sass.rb
View file

@ -3,7 +3,7 @@ module Bootstrap
# Inspired by Kaminari # Inspired by Kaminari
def self.load! def self.load!
if rails? if asset_pipeline?
require 'sass-rails' # See: https://github.com/thomas-mcdonald/bootstrap-sass/pull/4 require 'sass-rails' # See: https://github.com/thomas-mcdonald/bootstrap-sass/pull/4
require 'bootstrap-sass/engine' require 'bootstrap-sass/engine'
require 'bootstrap-sass/config/sass_extentions' require 'bootstrap-sass/config/sass_extentions'
@ -21,8 +21,8 @@ module Bootstrap
end end
private private
def self.rails? def self.asset_pipeline?
defined?(::Rails) defined?(::Rails) && ::Rails.version >= '3.1.0'
end end
def self.compass? def self.compass?
@ -30,4 +30,4 @@ module Bootstrap
end end
end end
Bootstrap.load! Bootstrap.load!