Skip to content
Browse files

Merge branch 'release/2.3.1.1'

* release/2.3.1.1:
  Bump version to 2.3.1.1
  Make clearfix mixin available as a class (Closes #45)
  Add test for #44
  Rails 4.0 on JRuby is still wonky
  Ruby 2.0.0 for Rails 3.1 is not supported
  Test against JRuby and MRI 2.0.0
  Test against Rails 4.0.0.beta1
  • Loading branch information...
2 parents f1e3c86 + 31f25a5 commit ed4075fff4f43bc5a0b0ad6efb6e8db87fa89938 @yabawock committed Mar 26, 2013
View
11 .travis.yml
@@ -1,6 +1,8 @@
language: ruby
rvm:
- 1.9.3
+ - 2.0.0
+ - jruby-19mode
gemfile:
- gemfiles/3.1.gemfile
@@ -14,3 +16,12 @@ branches:
before_install:
- gem install bundler
+
+matrix:
+ exclude:
+ - rvm: 2.0.0
+ gemfile: gemfiles/3.1.gemfile
+ allow_failures:
+ - rvm: 2.0.0
+ - rvm: jruby-19mode
+ gemfile: gemfiles/4.0.gemfile
View
10 Appraisals
@@ -7,10 +7,6 @@ appraise "3.2" do
end
appraise "4.0" do
- gem 'arel', github: 'rails/arel', branch: 'master'
- gem 'journey', github: 'rails/journey', branch: 'master'
- gem 'activerecord-deprecated_finders', github: 'rails/activerecord-deprecated_finders', branch: 'master'
- gem 'sass-rails', github: 'rails/sass-rails', branch: 'master'
- gem 'sprockets-rails', github: 'rails/sprockets-rails', branch: 'master'
- gem "rails", github: "rails/rails"
-end
+ gem "rails", ">= 4.0.0.beta1"
+ gem "sass-rails", ">= 4.0.0.beta1"
+end
View
2 bootstrap-sass-rails.gemspec
@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
s.add_dependency "railties", ">= 3.1.0"
s.add_dependency "sass-rails", ">= 3.1.0"
- s.add_development_dependency "rake", "~> 0.9.2"
+ s.add_development_dependency "rake"
s.add_development_dependency "rails", ">= 3.1.0"
s.add_development_dependency "appraisal", "~> 0.5.1"
end
View
8 gemfiles/4.0.gemfile
@@ -2,11 +2,7 @@
source "http://rubygems.org"
-gem "arel", :github=>"rails/arel", :branch=>"master"
-gem "journey", :github=>"rails/journey", :branch=>"master"
-gem "activerecord-deprecated_finders", :github=>"rails/activerecord-deprecated_finders", :branch=>"master"
-gem "sass-rails", :github=>"rails/sass-rails", :branch=>"master"
-gem "sprockets-rails", :github=>"rails/sprockets-rails", :branch=>"master"
-gem "rails", :github=>"rails/rails"
+gem "rails", ">= 4.0.0.beta1"
+gem "sass-rails", ">= 4.0.0.beta1"
gemspec :path=>"../"
View
2 lib/bootstrap/sass/rails/version.rb
@@ -1,7 +1,7 @@
module Bootstrap
module Sass
module Rails
- VERSION = '2.3.1.0'
+ VERSION = '2.3.1.1'
end
end
end
View
31 test/cases/less_to_sass_spec.rb
@@ -0,0 +1,31 @@
+require 'spec_helper'
+
+class LessToSassSpec < Bootstrap::Sass::Rails::Spec
+
+ describe 'application.css' do
+
+ let(:app_css) { dummy_asset('application.css') }
+
+ it 'should include a class for block level inputs' do
+ app_css.must_include '.input-block-level {'
+ end
+
+ it 'should include the clearfix helper classes' do
+ app_css.must_include '.clearfix { *zoom: 1; }'
+ app_css.must_include '.clearfix:before, .clearfix:after { display: table; content: ""; line-height: 0; }'
+ app_css.must_include '.clearfix:after { clear: both; }'
+ end
+
+ end
+
+ private
+
+ def line_for_framework_css(name)
+ framework_css.each_line.detect{ |line| line.include? name }.strip
+ end
+
+ def line_for_individual_css(name)
+ individual_css.each_line.detect{ |line| line.include? name }.strip
+ end
+
+end
View
3 vendor/assets/stylesheets/twitter/bootstrap/_mixins.scss
@@ -24,6 +24,9 @@
clear: both;
}
}
+.clearfix {
+ @include clearfix();
+}
// Webkit-style focus
// ------------------

0 comments on commit ed4075f

Please sign in to comment.
Something went wrong with that request. Please try again.