bootstrap-sass 3.3.4.1 → 3.4.1

data/package.json

@@ -1,8 +1,17 @@
 {
   "name": "bootstrap-sass",
-  "version": "3.3.4",
-  "description": "bootstrap-sass is a Sass-powered version of Bootstrap, ready to drop right into your Sass powered applications.",
+  "version": "3.4.1",
+  "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",
+  "style": "assets/stylesheets/_bootstrap.scss",
+  "sass": "assets/stylesheets/_bootstrap.scss",
+  "files": [
+    "assets",
+    "eyeglass-exports.js",
+    "CHANGELOG.md",
+    "LICENSE",
+    "README.md"
+  ],
   "repository": {
     "type": "git",
     "url": "git://github.com/twbs/bootstrap-sass"
@@ -10,7 +19,8 @@
   "keywords": [
     "bootstrap",
     "sass",
-    "css"
+    "css",
+    "eyeglass-module"
   ],
   "contributors": [
     "Thomas McDonald",
@@ -23,8 +33,12 @@
     "url": "https://github.com/twbs/bootstrap-sass/issues"
   },
   "devDependencies": {
-    "node-sass": "~2.0",
-    "mincer": "~1.2",
-    "ejs": "~1.0"
+    "node-sass": "^4.9.3",
+    "mincer": "~1.4.0",
+    "ejs": "~2.6.1"
+  },
+  "eyeglass": {
+    "exports": "eyeglass-exports.js",
+    "needs": "^0.7.1"
   }
 }

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

@@ -67,6 +67,7 @@ class Converter
         log_processing name
         # apply common conversions
         file = convert_less(file)
+        file = replace_all file, %r{// stylelint-disable.*?\n+}, '', optional: true
         if name.start_with?('mixins/')
           file = varargify_mixin_definitions(file, *VARARG_MIXINS)
           %w(responsive-(in)?visibility input-size text-emphasis-variant bg-variant).each do |mixin|
@@ -102,6 +103,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&'
@@ -118,13 +124,10 @@ class Converter
             file = replace_all file, /(\s*)\.navbar-(right|left)\s*\{\s*@extend\s*\.pull-(right|left);\s*/, "\\1.navbar-\\2 {\\1  float: \\2 !important;\\1"
           when 'tables.less'
             file = replace_all file, /(@include\s*table-row-variant\()(\w+)/, "\\1'\\2'"
-          when 'thumbnails.less', 'labels.less', 'badges.less'
+          when 'thumbnails.less', 'labels.less', 'badges.less', 'buttons.less'
             file = extract_nested_rule file, 'a&'
           when 'glyphicons.less'
-            file = replace_rules(file, '@font-face') { |rule|
-              rule = replace_all rule, /(\$icon-font(?:-\w+)+)/, '#{\1}'
-              replace_asset_url rule, :font
-            }
+            file = replace_rules(file, /\s*@font-face/) { |rule| replace_asset_url rule, :font }
           when 'type.less'
             file = apply_mixin_parent_selector(file, '\.(text|bg)-(success|primary|info|warning|danger)')
             # .bg-primary will not get patched automatically as it includes an additional rule. fudge for now
@@ -169,9 +172,16 @@ class Converter
       file   = deinterpolate_vararg_mixins(file)
       file   = replace_calculation_semantics(file)
       file   = replace_file_imports(file)
+      file   = wrap_at_groups_with_at_root(file)
       file
     end
 
+    def wrap_at_groups_with_at_root(file)
+      replace_rules(file, /@(?:font-face|-ms-viewport)/) { |rule, _pos|
+        %Q(@at-root {\n#{indent rule, 2}\n})
+      }
+    end
+
     def sass_fn_exists(fn)
       %Q{(#{fn}("") != unquote('#{fn}("")'))}
     end
@@ -313,10 +323,10 @@ SASS
                 %Q(@import "#{target_path}\\1";)
     end
 
-    def replace_all(file, regex, replacement = nil, &block)
+    def replace_all(file, regex, replacement = nil, optional: false, &block)
       log_transform regex, replacement
       new_file = file.gsub(regex, replacement, &block)
-      raise "replace_all #{regex}, #{replacement} NO MATCH" if file == new_file
+      raise "replace_all #{regex}, #{replacement} NO MATCH" if !optional && file == new_file
       new_file
     end
 
@@ -453,7 +463,7 @@ SASS
     def replace_ms_filters(file)
       log_transform
       file.gsub(
-          /filter: e\(%\("progid:DXImageTransform.Microsoft.gradient\(startColorstr='%d', endColorstr='%d', GradientType=(\d)\)",argb\(([\-$\w]+)\),argb\(([\-$\w]+)\)\)\);/,
+          /filter: e\(%\("progid:DXImageTransform.Microsoft.gradient\(startColorstr='%d', endColorstr='%d', GradientType=(\d)\)", ?argb\(([\-$\w]+)\), ?argb\(([\-$\w]+)\)\)\);/,
           %Q(filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='\#{ie-hex-str(\\2)}', endColorstr='\#{ie-hex-str(\\3)}', GradientType=\\1);)
       )
     end
@@ -499,7 +509,8 @@ SASS
     def replace_escaping(less)
       less = less.gsub(/~"([^"]+)"/, '\1').gsub(/~'([^']+)'/, '\1') # Get rid of ~"" escape
       less.gsub!(/\$\{([^}]+)\}/, '$\1') # Get rid of @{} escape
-      less.gsub!(/"([^"\n]*)(\$[\w\-]+)([^"\n]*)"/, '"\1#{\2}\3"') # interpolate variable in string, e.g. url("$file-1x") => url("#{$file-1x}")
+      # interpolate variables in strings, e.g. url("$file-1x") => url("#{$file-1x}")
+      less.gsub!(/"[^"\n]*"/) { |str| str.gsub(/\$[^"\n$.\\]+/, '#{\0}') }
       less.gsub(/(\W)e\(%\("?([^"]*)"?\)\)/, '\1\2') # Get rid of e(%("")) escape
     end
 

data/tasks/converter/network.rb

@@ -32,7 +32,7 @@ class Converter
       if File.directory?(full_path)
         files.each do |name|
           path = "#{full_path}/#{name}"
-          contents[name] = File.read(path, mode: 'rb') if File.exists?(path)
+          contents[name] = File.read(path, mode: 'rb') if File.exist?(path)
         end
       end
       contents
@@ -51,7 +51,7 @@ class Converter
       uri = URI(url)
       cache_path = "./#@cache_path#{uri.path}#{uri.query.tr('?&=', '-') if uri.query}"
       FileUtils.mkdir_p File.dirname(cache_path)
-      if File.exists?(cache_path)
+      if File.exist?(cache_path)
         log_http_get_file url, true
         File.read(cache_path, mode: 'rb')
       else

data/templates/project/_bootstrap-variables.sass

@@ -1,4 +1,4 @@
-// Override Bootstrap variables here (defaults from bootstrap-sass v3.3.4):
+// Override Bootstrap variables here (defaults from bootstrap-sass v3.4.0):
 
 //
 // Variables
@@ -52,14 +52,14 @@
 
 // $font-size-base:          14px
 // $font-size-large:         ceil(($font-size-base * 1.25)) // ~18px
-// $font-size-small:         ceil(($font-size-base * 0.85)) // ~12px
+// $font-size-small:         ceil(($font-size-base * .85)) // ~12px
 
 // $font-size-h1:            floor(($font-size-base * 2.6)) // ~36px
 // $font-size-h2:            floor(($font-size-base * 2.15)) // ~30px
 // $font-size-h3:            ceil(($font-size-base * 1.7)) // ~24px
 // $font-size-h4:            ceil(($font-size-base * 1.25)) // ~18px
 // $font-size-h5:            $font-size-base
-// $font-size-h6:            ceil(($font-size-base * 0.85)) // ~12px
+// $font-size-h6:            ceil(($font-size-base * .85)) // ~12px
 
 //** Unit-less `line-height` for use in components like buttons.
 // $line-height-base:        1.428571429 // 20/14
@@ -117,7 +117,7 @@
 //** Global background color for active items (e.g., navs or dropdowns).
 // $component-active-bg:       $brand-primary
 
-//** Width of the `border` for generating carets that indicator dropdowns.
+//** Width of the `border` for generating carets that indicate dropdowns.
 // $caret-width-base:          4px
 //** Carets increase slightly in size for larger components.
 // $caret-width-large:         5px
@@ -176,6 +176,11 @@
 
 // $btn-link-disabled-color:        $gray-light
 
+// Allows for customizing button radius independently from global border radius
+// $btn-border-radius-base:         $border-radius-base
+// $btn-border-radius-large:        $border-radius-large
+// $btn-border-radius-small:        $border-radius-small
+
 
 //== Forms
 //
@@ -235,7 +240,7 @@
 //** Background for the dropdown menu.
 // $dropdown-bg:                    #fff
 //** Dropdown menu `border-color`.
-// $dropdown-border:                rgba(0,0,0,.15)
+// $dropdown-border:                rgba(0, 0, 0, .15)
 //** Dropdown menu `border-color` **for IE8**.
 // $dropdown-fallback-border:       #ccc
 //** Divider color for between dropdown items.
@@ -389,7 +394,7 @@
 // $navbar-default-toggle-border-color:       #ddd
 
 
-// Inverted navbar
+//=== Inverted navbar
 // Reset inverted navbar basics
 // $navbar-inverse-color:                      lighten($gray-light, 15%)
 // $navbar-inverse-bg:                         #222
@@ -490,6 +495,7 @@
 // $jumbotron-bg:                   $gray-lighter
 // $jumbotron-heading-color:        inherit
 // $jumbotron-font-size:            ceil(($font-size-base * 1.5))
+// $jumbotron-heading-font-size:    ceil(($font-size-base * 4.5))
 
 
 //== Form states and alerts
@@ -540,7 +546,7 @@
 //** Popover maximum width
 // $popover-max-width:                   276px
 //** Popover border color
-// $popover-border-color:                rgba(0,0,0,.2)
+// $popover-border-color:                rgba(0, 0, 0, .2)
 //** Popover fallback border color
 // $popover-fallback-border-color:       #ccc
 
@@ -598,7 +604,7 @@
 //** Background color of modal content area
 // $modal-content-bg:                             #fff
 //** Modal content border color
-// $modal-content-border-color:                   rgba(0,0,0,.2)
+// $modal-content-border-color:                   rgba(0, 0, 0, .2)
 //** Modal content border color **for IE8**
 // $modal-content-fallback-border-color:          #999
 
@@ -803,7 +809,7 @@
 //
 //##
 
-// $carousel-text-shadow:                        0 1px 2px rgba(0,0,0,.6)
+// $carousel-text-shadow:                        0 1px 2px rgba(0, 0, 0, .6)
 
 // $carousel-control-color:                      #fff
 // $carousel-control-width:                      15%
@@ -863,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/compilation_test.rb

@@ -1,18 +1,30 @@
 require 'test_helper'
 require 'fileutils'
-require 'sass'
+require 'sassc'
 
 class CompilationTest < Minitest::Test
-  def test_compilation
-    path = 'assets/stylesheets'
-    %w(_bootstrap bootstrap/_theme).each do |file|
-      FileUtils.rm_rf('.sass-cache', secure: true)
-      engine = Sass::Engine.for_file("#{path}/#{file}.scss", syntax: :scss, load_paths: [path])
-      FileUtils.mkdir_p("tmp/#{File.dirname(file)}")
-      File.open("tmp/#{file}.css", 'w') { |f|
-        f.write engine.render
-      }
-      assert true # nothing was raised
-    end
+  def test_compilation_bootstrap
+    compile 'bootstrap'
+    assert true # nothing was raised
+  end
+
+  def test_compilation_bootstrap_theme
+    compile 'bootstrap/theme'
+    assert true # nothing was raised
+  end
+
+  private
+
+  def compile(file)
+    path = File.expand_path('../assets/stylesheets', __dir__)
+    FileUtils.rm_rf('.sass-cache', secure: true)
+    engine = SassC::Engine.new(
+      %Q{@import "#{path}/#{file}"},
+      syntax: :scss, load_paths: ['.']
+    )
+    FileUtils.mkdir_p("tmp/#{File.dirname(file)}")
+    File.open("tmp/#{file}.css", 'w') { |f|
+      f.write engine.render
+    }
   end
 end

data/test/dummy_rails/config/application.rb

@@ -12,13 +12,14 @@ end
 
 require 'slim-rails'
 require 'jquery-rails'
-require 'compass'
+require 'sassc-rails'
 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/dummy_rails/config/boot.rb

@@ -1,5 +1,5 @@
 # Set up gems listed in the Gemfile.
 ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../../../Gemfile', __FILE__)
 
-require 'bundler/setup' if File.exists?(ENV['BUNDLE_GEMFILE'])
+require 'bundler/setup' if File.exist?(ENV['BUNDLE_GEMFILE'])
 $LOAD_PATH.unshift File.expand_path('../../../../lib', __FILE__)

data/test/dummy_sass_only/Gemfile

@@ -1,4 +1,4 @@
 source 'https://rubygems.org'
 
-gem 'sass', '~> 3.2'
+gem 'sassc', '>= 2.0.0'
 gem 'bootstrap-sass', path: '../..'

data/test/dummy_sass_only/compile.rb

@@ -1,13 +1,20 @@
-require 'sass'
+# frozen_string_literal: true
+
+require 'sassc'
 require 'bootstrap-sass'
 require 'fileutils'
 
-scss_path = File.expand_path('./import_all.sass', File.dirname(__FILE__))
-css = Sass.compile File.read(scss_path), syntax: 'sass'
+load_path = ARGV[0]
+out_path = ARGV[1]
+
+output = SassC::Engine.new(
+  File.read(File.expand_path('./import_all.scss', __dir__)),
+  syntax: :scss, load_paths: ['.', load_path]
+).render
 
-if ARGV[0]
-  FileUtils.mkdir_p File.dirname(ARGV[0])
-  File.open(ARGV[0], 'w') { |f| f.write css }
+if out_path
+  FileUtils.mkdir_p(File.dirname(out_path))
+  File.write(out_path, output)
 else
-  puts css
+  puts output
 end

data/test/dummy_sass_only/import_all.scss

@@ -0,0 +1,2 @@
+@import 'bootstrap';
+@import 'bootstrap/theme';

data/test/gemfiles/default.gemfile

@@ -0,0 +1,3 @@
+source 'https://rubygems.org'
+
+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

@@ -1,8 +1,9 @@
-#!/bin/sh
+#!/bin/bash
 
 # 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_modules/.bin/node-sass assets/stylesheets/_bootstrap.scss -o tmp/node-sass/bootstrap.css && \
+node_modules/.bin/node-sass --include-path=assets/stylesheets/ \
+  assets/stylesheets/bootstrap/_theme.scss -o tmp/node-sass/bootstrap-theme.css || \
 (echo "node-sass compilation failed" && exit 1)

data/test/sass_test.rb

@@ -1,23 +1,26 @@
+# frozen_string_literal: true
+
 require 'test_helper'
 require 'shellwords'
+require 'fileutils'
+require 'bootstrap-sass'
 
 class SassTest < Minitest::Test
   DUMMY_PATH = 'test/dummy_sass_only'
 
   def test_font_helper
-    assert_match %r(url\(['"]?.*eot['"]?\)), @css
+    assert_match %r{url\(['"]?.*eot['"]?\)}, @css
   end
 
   def setup
-    Dir.chdir DUMMY_PATH do
-      %x[rm -rf .sass-cache/]
-      %x[bundle]
-    end
+    FileUtils.rm_rf(File.join(DUMMY_PATH, '.sass-cache'), secure: true)
     css_path = File.join GEM_PATH, 'tmp/bootstrap-sass-only.css'
-    command  = "bundle exec ruby compile.rb #{Shellwords.escape css_path}"
     success  = Dir.chdir DUMMY_PATH do
       silence_stdout_if !ENV['VERBOSE'] do
-        system(command)
+        Bundler.with_original_env do
+          system('bundle') && system('bundle', 'exec', 'ruby', 'compile.rb',
+                                     Bootstrap.stylesheets_path, css_path)
+        end
       end
     end
     assert success, 'Sass-only compilation failed'

data/test/sprockets_rails_test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'test_helper'
 require 'fileutils'
 require 'find'
@@ -6,22 +8,24 @@ require 'shellwords'
 class SprocketsRailsTest < Minitest::Test
 
   def test_sprockets_digest_asset_refs
-    root     = 'test/dummy_rails'
-    command  = "bundle exec rake assets:precompile GEMFILE=#{GEM_PATH}/Gemfile RAILS_ENV=production"
+    root = 'test/dummy_rails'
     compiled = Dir.chdir root do
       silence_stderr_if !ENV['VERBOSE'] do
-        system(command)
+        Bundler.with_original_env do
+          system({ 'BUNDLE_GEMFILE' => File.join(GEM_PATH, 'Gemfile'),
+                   'RAILS_ENV' => 'production' },
+                 'bundle && bundle exec rake assets:precompile')
+        end
       end
     end
     assert compiled, 'Could not precompile assets'
     Dir.glob(File.join(root, 'public', 'assets', 'app*.{css,js}')) do |path|
-      File.open(path, 'r') do |f|
-        f.read.scan /url\("?[^"]+\.(?:jpg|png|eot|woff2?|ttf|svg)[^"]*"?\)/ do |m|
-          assert_match /-[0-9a-f]{12,}\./, m
-        end
+      File.read(path)
+          .scan(/url\("?[^"]+\.(?:jpg|png|eot|woff2?|ttf|svg)[^"]*"?\)/) do |m|
+        assert_match(/-[0-9a-f]{12,}\./, m)
       end
     end
   ensure
-    FileUtils.rm_rf %W(#{root}/public/assets/ #{root}/tmp/cache/), secure: true
+    FileUtils.rm_rf %W[#{root}/public/assets/ #{root}/tmp/cache/], secure: true
   end
 end