Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Fix load sass_extentions in assets precompilation and compass

  • Loading branch information...
commit e8025d3d844110907c4c754a98e69474c7e19933 1 parent f71cf6e
@juggy juggy authored
View
2  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')
View
14 lib/bootstrap-sass/config/sass-ie_hex_str.rb
@@ -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
View
2  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
Please sign in to comment.
Something went wrong with that request. Please try again.