mirror of
https://github.com/twbs/bootstrap-sass.git
synced 2022-11-09 12:27:02 -05:00
Fix namespace Sass module due to conflict with bootstra-sass-rails
No one should really use the two together, but in case they do, or in case any other library defines a Bootstrap::Sass module, we should be clear that we mean the global core Sass module here. Fixes thomas-mcdonald/bootstrap-sass#293
This commit is contained in:
parent
1a9cf0b342
commit
5b17751454
1 changed files with 1 additions and 1 deletions
|
@ -18,7 +18,7 @@ module Bootstrap
|
|||
raise Bootstrap::FrameworkNotFound, "bootstrap-sass requires either Rails > 3.1 or Compass, neither of which are loaded"
|
||||
end
|
||||
stylesheets = File.expand_path(File.join("..", 'vendor', 'assets', 'stylesheets'))
|
||||
Sass.load_paths << stylesheets
|
||||
::Sass.load_paths << stylesheets
|
||||
end
|
||||
|
||||
private
|
||||
|
|
Loading…
Add table
Reference in a new issue