Skip to content

Commit

Permalink
Make it work with Rails 2.3 and Compass.
Browse files Browse the repository at this point in the history
  • Loading branch information
htanata committed Apr 4, 2012
1 parent 4a8dc21 commit 711f3b3
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions lib/bootstrap-sass.rb
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ class FrameworkNotFound < StandardError; end

# Inspired by Kaminari
def self.load!
if rails?
if rails_asset_pipeline?
require 'sass-rails' # See: https://github.com/thomas-mcdonald/bootstrap-sass/pull/4
require 'bootstrap-sass/engine'
require 'bootstrap-sass/config/sass_extentions'
Expand All @@ -20,8 +20,8 @@ def self.load!
end

private
def self.rails?
defined?(::Rails)
def self.rails_asset_pipeline?
defined?(::Rails) && ::Rails.version >= '3.1.0'
end

def self.compass?
Expand Down

0 comments on commit 711f3b3

Please sign in to comment.