diff --git a/lib/bootstrap-sass.rb b/lib/bootstrap-sass.rb index af20232933..05da7051f1 100644 --- a/lib/bootstrap-sass.rb +++ b/lib/bootstrap-sass.rb @@ -6,8 +6,10 @@ def self.load! if rails? require 'sass-rails' # See: https://github.com/thomas-mcdonald/bootstrap-sass/pull/4 require 'bootstrap-sass/engine' + require 'bootstrap-sass/config/sass_extentions' elsif compass? require 'bootstrap-sass/compass_extensions' + require 'bootstrap-sass/config/sass_extentions' base = File.join(File.dirname(__FILE__), '..') styles = File.join(base, 'vendor', 'assets', 'stylesheets') templates = File.join(base, 'templates') diff --git a/lib/bootstrap-sass/config/sass-ie_hex_str.rb b/lib/bootstrap-sass/config/sass-ie_hex_str.rb deleted file mode 100644 index 51bb904faa..0000000000 --- a/lib/bootstrap-sass/config/sass-ie_hex_str.rb +++ /dev/null @@ -1,14 +0,0 @@ -require 'sass' - -module Sass::Script::Functions - # LARS: Snatched from compass - 2011-11-29 - used for gradients in IE6-9 - # returns an IE hex string for a color with an alpha channel - # suitable for passing to IE filters. - def ie_hex_str(color) - assert_type color, :Color - alpha = (color.alpha * 255).round - alphastr = alpha.to_s(16).rjust(2, '0') - Sass::Script::String.new("##{alphastr}#{color.send(:hex_str)[1..-1]}".upcase) - end - declare :ie_hex_str, [:color] -end \ No newline at end of file diff --git a/lib/bootstrap-sass/engine.rb b/lib/bootstrap-sass/engine.rb index 27c3e92e60..4a9e9705e3 100644 --- a/lib/bootstrap-sass/engine.rb +++ b/lib/bootstrap-sass/engine.rb @@ -3,7 +3,7 @@ module Rails class Engine < ::Rails::Engine # Rails, will you please look in our vendor? kthx # also add our initializer. - paths["config/initializers"] << 'lib/bootstrap-sass/config' + # paths["config/initializers"] << 'lib/bootstrap-sass/config' end end end \ No newline at end of file