bootstrap-sass 3.3.5.1 → 3.3.6

data/bootstrap-sass.gemspec

@@ -3,22 +3,22 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'bootstrap-sass/version'
 
 Gem::Specification.new do |s|
-  s.name     = "bootstrap-sass"
+  s.name     = 'bootstrap-sass'
   s.version  = Bootstrap::VERSION
-  s.authors  = ["Thomas McDonald"]
+  s.authors  = ['Thomas McDonald']
   s.email    = 'tom@conceptcoding.co.uk'
-  s.summary  = "Twitter's Bootstrap, converted to Sass and ready to drop into Rails or Compass"
-  s.homepage = "https://github.com/twbs/bootstrap-sass"
+  s.summary  = 'bootstrap-sass is a Sass-powered version of Bootstrap 3, ready to drop right into your Sass powered applications.'
+  s.homepage = 'https://github.com/twbs/bootstrap-sass'
   s.license  = 'MIT'
 
-  s.add_runtime_dependency 'sass', '>= 3.3.0'
-  s.add_runtime_dependency 'autoprefixer-rails', '>= 5.0.0.1'
+  s.add_runtime_dependency 'sass', '>= 3.3.4'
+  s.add_runtime_dependency 'autoprefixer-rails', '>= 5.2.1'
 
   # Testing dependencies
-  s.add_development_dependency 'minitest', '~> 5.4.0'
-  s.add_development_dependency 'minitest-reporters', '~> 1.0.5'
+  s.add_development_dependency 'minitest', '~> 5.8'
+  s.add_development_dependency 'minitest-reporters', '~> 1.1'
   # Integration testing
-  s.add_development_dependency 'capybara'
+  s.add_development_dependency 'capybara', '>= 2.5.0'
   s.add_development_dependency 'poltergeist'
   # Dummy Rails app dependencies
   s.add_development_dependency 'actionpack', '>= 4.1.5'

data/bower.json

@@ -7,7 +7,7 @@
     "Peter Gumeson",
     "Gleb Mazovetskiy"
   ],
-  "description": "bootstrap-sass is a Sass-powered version of Bootstrap, ready to drop right into your Sass powered applications.",
+  "description": "bootstrap-sass is a Sass-powered version of Bootstrap 3, ready to drop right into your Sass powered applications.",
   "moduleType": "globals",
   "main": [
     "assets/stylesheets/_bootstrap.scss",
@@ -31,5 +31,6 @@
   ],
   "dependencies": {
     "jquery": ">= 1.9.0"
-  }
+  },
+  "version": "3.3.6"
 }

data/composer.json

@@ -1,6 +1,6 @@
 {
     "name": "twbs/bootstrap-sass",
-    "description": "bootstrap-sass is a Sass-powered version of Bootstrap, ready to drop right into your Sass powered applications.",
+    "description": "bootstrap-sass is a Sass-powered version of Bootstrap 3, ready to drop right into your Sass powered applications.",
     "keywords": ["bootstrap", "css", "sass"],
     "homepage": "http://github.com/twbs/bootstrap-sass",
     "authors": [

data/lib/bootstrap-sass.rb

@@ -7,6 +7,8 @@ module Bootstrap
 
       if rails?
         register_rails_engine
+      elsif lotus?
+        register_lotus
       elsif sprockets?
         register_sprockets
       end
@@ -48,6 +50,10 @@ module Bootstrap
       defined?(::Rails)
     end
 
+    def lotus?
+      defined?(::Lotus)
+    end
+
     private
 
     def configure_sass
@@ -73,6 +79,10 @@ module Bootstrap
       require 'bootstrap-sass/engine'
     end
 
+    def register_lotus
+      Lotus::Assets.sources << assets_path
+    end
+
     def register_sprockets
       Sprockets.append_path(stylesheets_path)
       Sprockets.append_path(fonts_path)

data/lib/bootstrap-sass/engine.rb

@@ -5,7 +5,12 @@ module Bootstrap
         %w(stylesheets javascripts fonts images).each do |sub|
           app.config.assets.paths << root.join('assets', sub).to_s
         end
-        app.config.assets.precompile << %r(bootstrap/glyphicons-halflings-regular\.(?:eot|svg|ttf|woff2?)$)
+
+        # sprockets-rails 3 tracks down the calls to `font_path` and `image_path`
+        # and automatically precompiles the referenced assets.
+        unless Sprockets::Rails::VERSION.split('.', 2)[0].to_i >= 3
+          app.config.assets.precompile << %r(bootstrap/glyphicons-halflings-regular\.(?:eot|svg|ttf|woff2?)$)
+        end
       end
     end
   end

data/lib/bootstrap-sass/version.rb

@@ -1,4 +1,4 @@
 module Bootstrap
-  VERSION       = '3.3.5.1'
-  BOOTSTRAP_SHA = '16b48259a62f576e52c903c476bd42b90ab22482'
+  VERSION       = '3.3.6'
+  BOOTSTRAP_SHA = '81df608a40bf0629a1dc08e584849bb1e43e0b7a'
 end

data/package.json

@@ -1,7 +1,7 @@
 {
   "name": "bootstrap-sass",
-  "version": "3.3.5",
-  "description": "bootstrap-sass is a Sass-powered version of Bootstrap, ready to drop right into your Sass powered applications.",
+  "version": "3.3.6",
+  "description": "bootstrap-sass is a Sass-powered version of Bootstrap 3, ready to drop right into your Sass powered applications.",
   "main": "assets/javascripts/bootstrap.js",
   "repository": {
     "type": "git",
@@ -23,8 +23,8 @@
     "url": "https://github.com/twbs/bootstrap-sass/issues"
   },
   "devDependencies": {
-    "node-sass": "~2.0",
-    "mincer": "~1.2",
-    "ejs": "~1.0"
+    "node-sass": "~3.4.2",
+    "mincer": "~1.3",
+    "ejs": "~2.3"
   }
 }

data/sache.json

@@ -1,5 +1,5 @@
 {
     "name": "bootstrap-sass",
-    "description": "bootstrap-sass is a Sass-powered version of Bootstrap, ready to drop right into your Sass powered applications",
+    "description": "bootstrap-sass is a Sass-powered version of Bootstrap 3, ready to drop right into your Sass powered applications.",
     "tags": ["bootstrap", "grid", "typography", "buttons", "ui", "responsive-web-design"]
 }

data/tasks/converter/less_conversion.rb

@@ -102,6 +102,11 @@ class Converter
               // [converter] This is because some asset helpers, such as Sprockets, do not work with file-relative paths.
               \\1: if($bootstrap-sass-asset-helper, "bootstrap/", "\\2bootstrap/") \\3;
             SCSS
+          when 'breadcrumbs.less'
+            file = replace_all file, /(.*)(\\00a0)/, unindent(<<-SCSS, 8) + "\\1\#{$nbsp}"
+              // [converter] Workaround for https://github.com/sass/libsass/issues/1115
+              $nbsp: "\\2";
+            SCSS
           when 'close.less'
             # extract .close { button& {...} } rule
             file = extract_nested_rule file, 'button&'

data/templates/project/_bootstrap-variables.sass

@@ -1,4 +1,4 @@
-// Override Bootstrap variables here (defaults from bootstrap-sass v3.3.5):
+// Override Bootstrap variables here (defaults from bootstrap-sass v3.3.6):
 
 //
 // Variables
@@ -869,5 +869,7 @@
 // $page-header-border-color:    $gray-lighter
 //** Width of horizontal description list titles
 // $dl-horizontal-offset:        $component-offset-horizontal
+//** Point at which .dl-horizontal becomes horizontal
+// $dl-horizontal-breakpoint:    $grid-float-breakpoint
 //** Horizontal line color.
 // $hr-border:                   $gray-lighter

data/test/dummy_rails/config/application.rb

@@ -12,13 +12,13 @@ end
 
 require 'slim-rails'
 require 'jquery-rails'
-require 'compass'
 require 'bootstrap-sass'
 require 'uglifier'
 
 module Dummy
   class Application < Rails::Application
     config.assets.enabled = true if config.assets.respond_to?(:enabled)
+    config.assets.precompile += %w( application.css application.js )
     config.to_prepare do
       if ENV['VERBOSE']
         STDERR.puts "Loaded Rails #{Rails::VERSION::STRING}, Sprockets #{Sprockets::VERSION}",

data/test/gemfiles/rails_head.gemfile

@@ -0,0 +1,17 @@
+source "https://rubygems.org"
+
+gem 'actionpack', github: 'rails/rails'
+gem 'activesupport', github: 'rails/rails'
+
+# Required git dependencies as per https://github.com/rails/rails/blob/51211a94bd7a34d80f2412a7f94fefe7366647a5/Gemfile:
+gem 'rack', github: 'rack/rack'
+gem 'sprockets', github: 'rails/sprockets'
+gem 'sprockets-rails', github: 'rails/sprockets-rails'
+gem 'sass-rails', github: 'rails/sass-rails', branch: 'master'
+
+gem 'autoprefixer-rails', github: 'ai/autoprefixer-rails'
+
+gem 'compass', '~> 1.0.1', require: false
+
+gemspec path: '../../'
+

data/test/node_mincer_test.rb

@@ -22,15 +22,14 @@ class NodeMincerTest < Minitest::Test
 
   def setup
     tmp_dir = File.join GEM_PATH, 'tmp/node-mincer'
-    command = "node manifest.js #{tmp_dir}"
     success = Dir.chdir DUMMY_PATH do
       silence_stdout_if !ENV['VERBOSE'] do
-        system(command)
+        system 'node', 'manifest.js', tmp_dir
       end
     end
     assert success, 'Node.js Mincer compilation failed'
     manifest = JSON.parse(File.read("#{tmp_dir}/manifest.json"))
-    css_name = manifest["assets"]["application.css"]
+    css_name = manifest['assets']['application.css']
     @css = File.read("#{tmp_dir}/#{css_name}")
   end
 end

data/test/node_sass_compile_test.sh

@@ -3,6 +3,6 @@
 # Test compilation with node-sass binary
 
 mkdir -p tmp/node-sass
-node-sass assets/stylesheets/bootstrap -o tmp/node-sass/bootstrap.css && \
-node-sass assets/stylesheets/bootstrap/theme -o tmp/node-sass/bootstrap-theme.css || \
+node-sass assets/stylesheets/_bootstrap.scss -o tmp/node-sass/bootstrap.css && \
+node-sass assets/stylesheets/bootstrap/_theme.scss -o tmp/node-sass/bootstrap-theme.css || \
 (echo "node-sass compilation failed" && exit 1)

data/test/support/reporting.rb

@@ -14,4 +14,14 @@ module Kernel
       run.call
     end
   end
+
+  def silence_stream(stream)
+    old_stream = stream.dup
+    stream.reopen(File::NULL)
+    stream.sync = true
+    yield
+  ensure
+    stream.reopen(old_stream)
+    old_stream.close
+  end unless method_defined?(:silence_stream)
 end

data/test/test_helper.rb

@@ -30,6 +30,6 @@ Capybara.configure do |config|
   config.default_driver    = :poltergeist
   config.javascript_driver = :poltergeist
   config.server_port       = 7000
-  config.default_wait_time = 10
+  config.default_max_wait_time = 10
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bootstrap-sass
 version: !ruby/object:Gem::Version
-  version: 3.3.5.1
+  version: 3.3.6
 platform: ruby
 authors:
 - Thomas McDonald
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-25 00:00:00.000000000 Z
+date: 2015-11-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sass
@@ -16,70 +16,70 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.3.0
+        version: 3.3.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.3.0
+        version: 3.3.4
 - !ruby/object:Gem::Dependency
   name: autoprefixer-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.0.0.1
+        version: 5.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.0.0.1
+        version: 5.2.1
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.4.0
+        version: '5.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.4.0
+        version: '5.8'
 - !ruby/object:Gem::Dependency
   name: minitest-reporters
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.5
+        version: '1.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.5
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.5.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.5.0
 - !ruby/object:Gem::Dependency
   name: poltergeist
   requirement: !ruby/object:Gem::Requirement
@@ -370,6 +370,7 @@ files:
 - test/dummy_sass_only/Gemfile
 - test/dummy_sass_only/compile.rb
 - test/dummy_sass_only/import_all.sass
+- test/gemfiles/rails_head.gemfile
 - test/gemfiles/sass_3_3.gemfile
 - test/gemfiles/sass_3_4.gemfile
 - test/gemfiles/sass_head.gemfile
@@ -402,10 +403,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
-summary: Twitter's Bootstrap, converted to Sass and ready to drop into Rails or Compass
+summary: bootstrap-sass is a Sass-powered version of Bootstrap 3, ready to drop right
+  into your Sass powered applications.
 test_files:
 - test/compass_test.rb
 - test/compilation_test.rb
@@ -443,6 +445,7 @@ test_files:
 - test/dummy_sass_only/Gemfile
 - test/dummy_sass_only/compile.rb
 - test/dummy_sass_only/import_all.sass
+- test/gemfiles/rails_head.gemfile
 - test/gemfiles/sass_3_3.gemfile
 - test/gemfiles/sass_3_4.gemfile
 - test/gemfiles/sass_head.gemfile
@@ -455,4 +458,3 @@ test_files:
 - test/support/reporting.rb
 - test/test_helper.rb
 - test/test_helper_rails.rb
-has_rdoc: