Merge branch 'next'

Conflicts:
	README.md
	lib/bootstrap-sass.rb

Author: glebm

.gitignore

@@ -14,6 +14,6 @@ Gemfile.lock
 tmp/
 test/screenshots/
 test/dummy_rails/log/*.log
-
+test/dummy_rails/public/assets/
 .DS_Store
 node_modules

.travis.yml

@@ -1,12 +1,12 @@
 language: ruby
 rvm:
-  - 2.1.1
-  - 2.0.0
+  - 2.1.2
   - jruby
   - rbx-2
 gemfile:
   - test/gemfiles/sass_3_2.gemfile
   - test/gemfiles/sass_3_3.gemfile
+  - test/gemfiles/sass_3_4.gemfile
   - test/gemfiles/sass_head.gemfile
 before_install:
   - "npm install"
@@ -17,3 +17,9 @@ matrix:
     - gemfile: test/gemfiles/sass_head.gemfile
 notifications:
   slack: heybb:3n88HHilXn76ji9vV4gL819Y
+env:
+  global:
+  - VERBOSE=1
+script:
+  - bundle exec rake
+  - sh test/*.sh

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## 3.3.0
+
+* Improve libsass compatibility
+* Support using Bower package with Rails
+
 ## 3.2.0.2
 
 Main bootstrap file is now a partial (_bootstrap.scss), for compatibility with Compass 1+.

README.md

@@ -17,7 +17,7 @@ Please see the appropriate guide for your environment of choice:
 In your Gemfile you need to add the `bootstrap-sass` gem, and ensure that the `sass-rails` gem is present - it is added to new Rails applications by default.
 
 ```ruby
-gem 'bootstrap-sass', '~> 3.2.0'
+gem 'bootstrap-sass', '~> 3.3.0'
 gem 'sass-rails', '>= 3.2'
 ```
 
@@ -33,6 +33,7 @@ gem 'autoprefixer-rails'
 Import Bootstrap styles in `app/assets/stylesheets/application.css.scss`:
 
 ```scss
+// "bootstrap-sprockets" must be imported before "bootstrap" and "bootstrap/variables"
 @import "bootstrap-sprockets";
 @import "bootstrap";
 ```
@@ -57,13 +58,29 @@ Require Bootstrap Javascripts in `app/assets/javascripts/application.js`:
 
 #### Bower with Rails
 
-When using [bootstrap-sass Bower package](#c-bower) in Rails, ensure [minimum Sass number precision](#sass-number-precision):
+When using [bootstrap-sass Bower package](#c-bower) instead of the gem in Rails, add Bootstrap asset paths:
 
 ```ruby
-# e.g. config/initializers/sass.rb
+# config/application.rb
+# bootstrap-sass asset paths
+root.join('vendor/assets/bower_components/bootstrap-sass/assets').tap do |path|
+  config.sass.load_paths << path.join('stylesheets')
+  config.assets.paths += %w(javascripts fonts images).map(&path.method(:join))
+end
+```
+
+Then, ensure [minimum Sass number precision](#sass-number-precision):
+
+```ruby
+# config/initializers/sass.rb
+# Minimum precision required by bootstrap-sass
 ::Sass::Script::Number.precision = [10, ::Sass::Script::Number.precision].max
 ```
 
+#### Rails 4.x
+
+Please make sure `sprockets-rails` is at least v2.1.4.
+
 #### Rails 3.2.x
 
 Rails 3.2 is [no longer maintained for bugfixes](http://guides.rubyonrails.org/maintenance_policy.html), and you should upgrade as soon as possible.
@@ -159,8 +176,8 @@ See also this [example manifest.js](/test/dummy_node_mincer/manifest.js) for min
 By default all of Bootstrap is imported.
 
 You can also import components explicitly. To start with a full list of modules copy
-[`bootstrap.scss`](assets/stylesheets/_bootstrap.scss) file into your assets as `bootstrap-custom.scss`.
-Then comment out components you do not want from `bootstrap-custom`.
+[`_bootstrap.scss`](assets/stylesheets/_bootstrap.scss) file into your assets as `_bootstrap-custom.scss`.
+Then comment out components you do not want from `_bootstrap-custom`.
 In the application Sass file, replace `@import 'bootstrap'` with:
 
 ```scss

Rakefile

@@ -4,10 +4,9 @@ $:.unshift(lib_path) unless $:.include?(lib_path)
 load './tasks/bower.rake'
 
 require 'rake/testtask'
-Rake::TestTask.new do |t|
-  t.libs << "test"
-  t.test_files = FileList['test/*_test.rb']
-  t.verbose    = true
+task :test do |t|
+  $: << File.expand_path('test/')
+  Dir.glob('./test/**/*_test.rb').each { |file| require file }
 end
 
 desc 'Dumps output to a CSS file for testing'