bootstrap-sass 3.3.1.0 → 3.3.2.0

data/assets/stylesheets/bootstrap/_jumbotron.scss

@@ -13,6 +13,7 @@
   .h1 {
     color: $jumbotron-heading-color;
   }
+  
   p {
     margin-bottom: ($jumbotron-padding / 2);
     font-size: $jumbotron-font-size;

data/assets/stylesheets/bootstrap/_media.scss

@@ -7,6 +7,20 @@
   }
 }
 
+.media,
+.media-body {
+  zoom: 1;
+  overflow: hidden;
+}
+
+.media-body {
+  width: 10000px;
+}
+
+.media-object {
+  display: block;
+}
+
 .media-right,
 .media > .pull-right {
   padding-left: 10px;

data/assets/stylesheets/bootstrap/_navbar.scss

@@ -331,6 +331,7 @@
 }
 // Menu position and menu caret support for dropups via extra dropup class
 .navbar-fixed-bottom .navbar-nav > li > .dropdown-menu {
+  margin-bottom: 0;
   @include border-top-radius($navbar-border-radius);
   @include border-bottom-radius(0);
 }

data/assets/stylesheets/bootstrap/_panels.scss

@@ -36,7 +36,11 @@
   font-size: ceil(($font-size-base * 1.125));
   color: inherit;
 
-  > a {
+  > a,
+  > small,
+  > .small,
+  > small > a,
+  > .small > a {
     color: inherit;
   }
 }

data/assets/stylesheets/bootstrap/_popovers.scss

@@ -11,7 +11,7 @@
   display: none;
   max-width: $popover-max-width;
   padding: 1px;
-  // Reset font and text propertes given new insertion method
+  // Reset font and text properties given new insertion method
   font-family: $font-family-base;
   font-size: $font-size-base;
   font-weight: normal;

data/assets/stylesheets/bootstrap/_responsive-utilities.scss

@@ -26,7 +26,10 @@
 // Visibility utilities
 // Note: Deprecated .visible-xs, .visible-sm, .visible-md, and .visible-lg as of v3.2.0
 
-@include responsive-invisibility('.visible-xs, .visible-sm, .visible-md, .visible-lg');
+@include responsive-invisibility('.visible-xs');
+@include responsive-invisibility('.visible-sm');
+@include responsive-invisibility('.visible-md');
+@include responsive-invisibility('.visible-lg');
 
 .visible-xs-block,
 .visible-xs-inline,

data/assets/stylesheets/bootstrap/_tables.scss

@@ -111,7 +111,7 @@ th {
 // Default zebra-stripe styles (alternating gray and transparent backgrounds)
 
 .table-striped {
-  > tbody > tr:nth-child(odd) {
+  > tbody > tr:nth-of-type(odd) {
     background-color: $table-bg-accent;
   }
 }
@@ -133,7 +133,7 @@ th {
 // Reset default table behavior
 
 table col[class*="col-"] {
-  position: static; // Prevent border hiding in Firefox and IE9/10 (see https://github.com/twbs/bootstrap/issues/11623)
+  position: static; // Prevent border hiding in Firefox and IE9-11 (see https://github.com/twbs/bootstrap/issues/11623)
   float: none;
   display: table-column;
 }
@@ -141,7 +141,7 @@ table {
   td,
   th {
     &[class*="col-"] {
-      position: static; // Prevent border hiding in Firefox and IE9/10 (see https://github.com/twbs/bootstrap/issues/11623)
+      position: static; // Prevent border hiding in Firefox and IE9-11 (see https://github.com/twbs/bootstrap/issues/11623)
       float: none;
       display: table-cell;
     }

data/assets/stylesheets/bootstrap/_theme.scss

@@ -36,7 +36,7 @@
 // Mixin for generating new styles
 @mixin btn-styles($btn-color: #555) {
   @include gradient-vertical($start-color: $btn-color, $end-color: darken($btn-color, 12%));
-  @include reset-filter; // Disable gradients for IE9 because filter bleeds through rounded corners
+  @include reset-filter; // Disable gradients for IE9 because filter bleeds through rounded corners; see https://github.com/twbs/bootstrap/issues/10620
   background-repeat: repeat-x;
   border-color: darken($btn-color, 14%);
 
@@ -52,6 +52,7 @@
     border-color: darken($btn-color, 14%);
   }
 
+  &.disabled,
   &:disabled,
   &[disabled] {
     background-color: darken($btn-color, 12%);
@@ -130,7 +131,7 @@
 // Inverted navbar
 .navbar-inverse {
   @include gradient-vertical($start-color: lighten($navbar-inverse-bg, 10%), $end-color: $navbar-inverse-bg);
-  @include reset-filter; // Remove gradient in IE<10 to fix bug where dropdowns don't get triggered
+  @include reset-filter; // Remove gradient in IE<10 to fix bug where dropdowns don't get triggered; see https://github.com/twbs/bootstrap/issues/10257
 
   .navbar-nav > .open > a,
   .navbar-nav > .active > a {

data/assets/stylesheets/bootstrap/_tooltip.scss

@@ -9,7 +9,7 @@
   z-index: $zindex-tooltip;
   display: block;
   visibility: visible;
-  // Reset font and text propertes given new insertion method
+  // Reset font and text properties given new insertion method
   font-family: $font-family-base;
   font-size: $font-size-small;
   font-weight: normal;

data/assets/stylesheets/bootstrap/_variables.scss

@@ -1,8 +1,4 @@
-// When true, asset path helpers are used, otherwise the regular CSS `url()` is used.
-// When there no function is defined, `fn('')` is parsed as string that equals the right hand side
-// NB: in Sass 3.3 there is a native function: function-exists(twbs-font-path)
-$bootstrap-sass-asset-helper: (twbs-font-path("") != unquote('twbs-font-path("")')) !default;
-
+$bootstrap-sass-asset-helper: false !default;
 //
 // Variables
 // --------------------------------------------------
@@ -19,7 +15,7 @@ $gray:                   lighten($gray-base, 33.5%) !default; // #555
 $gray-light:             lighten($gray-base, 46.7%) !default; // #777
 $gray-lighter:           lighten($gray-base, 93.5%) !default; // #eee
 
-$brand-primary:         darken(#428bca, 6.5%) !default;
+$brand-primary:         darken(#428bca, 6.5%) !default; // #337ab7
 $brand-success:         #5cb85c !default;
 $brand-info:            #5bc0de !default;
 $brand-warning:         #f0ad4e !default;
@@ -82,7 +78,8 @@ $headings-color:          inherit !default;
 
 //** Load fonts from this directory.
 
-// [converter] Asset helpers such as Sprockets and Node.js Mincer do not resolve relative paths
+// [converter] If $bootstrap-sass-asset-helper if used, provide path relative to the assets load path.
+// [converter] This is because some asset helpers, such as Sprockets, do not work with file-relative paths.
 $icon-font-path: if($bootstrap-sass-asset-helper, "bootstrap/", "../fonts/bootstrap/") !default;
 
 //** File name for all font files.
@@ -107,7 +104,7 @@ $padding-small-horizontal:  10px !default;
 $padding-xs-vertical:       1px !default;
 $padding-xs-horizontal:     5px !default;
 
-$line-height-large:         1.33 !default;
+$line-height-large:         1.3333333 !default; // extra decimals for Win 8.1 Chrome
 $line-height-small:         1.5 !default;
 
 $border-radius-base:        4px !default;
@@ -195,6 +192,7 @@ $input-border:                   #ccc !default;
 
 // TODO: Rename `$input-border-radius` to `$input-border-radius-base` in v4
 //** Default `.form-control` border radius
+// This has no effect on `<select>`s in some browsers, due to the limited stylability of `<select>`s in CSS.
 $input-border-radius:            $border-radius-base !default;
 //** Large `.form-control` border radius
 $input-border-radius-large:      $border-radius-large !default;

data/assets/stylesheets/bootstrap/mixins/_hide-text.scss

@@ -8,7 +8,7 @@
 
 // Deprecated as of v3.0.1 (will be removed in v4)
 @mixin hide-text() {
-  font: #{0/0} a;
+  font: 0/0 a;
   color: transparent;
   text-shadow: none;
   background-color: transparent;

data/assets/stylesheets/bootstrap/mixins/_opacity.scss

@@ -4,5 +4,5 @@
   opacity: $opacity;
   // IE8 filter
   $opacity-ie: ($opacity * 100);
-  filter: #{alpha(opacity=$opacity-ie)};
+  filter: alpha(opacity=$opacity-ie);
 }

data/assets/stylesheets/bootstrap/mixins/_vendor-prefixes.scss

@@ -102,7 +102,7 @@
   // Firefox
   &::-moz-placeholder {
     color: $color;
-    opacity: 1; // See https://github.com/twbs/bootstrap/pull/11526
+    opacity: 1; // Override Firefox's unusual default opacity; see https://github.com/twbs/bootstrap/pull/11526
   }
   &:-ms-input-placeholder { color: $color; } // Internet Explorer 10+
   &::-webkit-input-placeholder  { color: $color; } // Safari and Chrome

data/bootstrap-sass.gemspec

@@ -11,7 +11,8 @@ Gem::Specification.new do |s|
   s.homepage = "https://github.com/twbs/bootstrap-sass"
   s.license  = 'MIT'
 
-  s.add_runtime_dependency 'sass', '~> 3.2'
+  s.add_runtime_dependency 'sass', '>= 3.2.19'
+  s.add_runtime_dependency 'autoprefixer-rails', '>= 5.0.0.1'
 
   # Testing dependencies
   s.add_development_dependency 'minitest', '~> 5.4.0'
@@ -24,7 +25,6 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'activesupport', '>= 4.1.5'
   s.add_development_dependency 'json', '>= 1.8.1'
   s.add_development_dependency 'sprockets-rails', '>= 2.1.3'
-  s.add_development_dependency 'autoprefixer-rails', '~> 1.1'
   s.add_development_dependency 'jquery-rails', '>= 3.1.0'
   s.add_development_dependency 'slim-rails'
   s.add_development_dependency 'uglifier'

data/bower.json

@@ -1,6 +1,6 @@
 {
   "name": "bootstrap-sass",
-  "version": "3.3.1",
+  "version": "3.3.2",
   "homepage": "https://github.com/twbs/bootstrap-sass",
   "authors": [
     "Thomas McDonald",
@@ -15,18 +15,8 @@
     "assets/fonts/bootstrap/glyphicons-halflings-regular.svg",
     "assets/fonts/bootstrap/glyphicons-halflings-regular.ttf",
     "assets/fonts/bootstrap/glyphicons-halflings-regular.woff",
-    "assets/javascripts/bootstrap/affix.js",
-    "assets/javascripts/bootstrap/alert.js",
-    "assets/javascripts/bootstrap/button.js",
-    "assets/javascripts/bootstrap/carousel.js",
-    "assets/javascripts/bootstrap/collapse.js",
-    "assets/javascripts/bootstrap/dropdown.js",
-    "assets/javascripts/bootstrap/tab.js",
-    "assets/javascripts/bootstrap/transition.js",
-    "assets/javascripts/bootstrap/scrollspy.js",
-    "assets/javascripts/bootstrap/modal.js",
-    "assets/javascripts/bootstrap/tooltip.js",
-    "assets/javascripts/bootstrap/popover.js"
+    "assets/fonts/bootstrap/glyphicons-halflings-regular.woff2",
+    "assets/javascripts/bootstrap.js"
   ],
   "keywords": [
     "twbs",

data/lib/bootstrap-sass.rb

@@ -4,7 +4,13 @@ module Bootstrap
     # Inspired by Kaminari
     def load!
       register_compass_extension if compass?
-      register_rails_engine      if rails?
+
+      if rails?
+        register_rails_engine
+      elsif sprockets?
+        register_sprockets
+      end
+
       configure_sass
     end
 
@@ -30,7 +36,7 @@ module Bootstrap
     end
 
     # Environment detection helpers
-    def asset_pipeline?
+    def sprockets?
       defined?(::Sprockets)
     end
 
@@ -49,8 +55,8 @@ module Bootstrap
 
       ::Sass.load_paths << stylesheets_path
 
-      # bootstrap requires minimum precision of 10, see https://github.com/twbs/bootstrap-sass/issues/409
-      ::Sass::Script::Number.precision = [10, ::Sass::Script::Number.precision].max
+      # bootstrap requires minimum precision of 8, see https://github.com/twbs/bootstrap-sass/issues/409
+      ::Sass::Script::Number.precision = [8, ::Sass::Script::Number.precision].max
     end
 
     def register_compass_extension
@@ -66,6 +72,12 @@ module Bootstrap
     def register_rails_engine
       require 'bootstrap-sass/engine'
     end
+
+    def register_sprockets
+      Sprockets.append_path(stylesheets_path)
+      Sprockets.append_path(fonts_path)
+      Sprockets.append_path(javascripts_path)
+    end
   end
 end
 

data/lib/bootstrap-sass/engine.rb

@@ -5,7 +5,7 @@ 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|woff)$)
+        app.config.assets.precompile << %r(bootstrap/glyphicons-halflings-regular\.(?:eot|svg|ttf|woff2?)$)
       end
     end
   end

data/lib/bootstrap-sass/version.rb

@@ -1,4 +1,4 @@
 module Bootstrap
-  VERSION = '3.3.1.0'
-  BOOTSTRAP_SHA = '9a7e365c2c4360335d25246dac11afb1f577210a'
+  VERSION = '3.3.2.0'
+  BOOTSTRAP_SHA = 'bcf7dd38b5ab180256e2e4fb5da0369551b3f082'
 end

data/package.json

@@ -1,8 +1,8 @@
 {
   "name": "bootstrap-sass",
-  "version": "3.3.1",
+  "version": "3.3.2",
   "description": "bootstrap-sass is a Sass-powered version of Bootstrap, ready to drop right into your Sass powered applications.",
-  "main": "index.js",
+  "main": "assets/javascripts/bootstrap.js",
   "repository": {
     "type": "git",
     "url": "git://github.com/twbs/bootstrap-sass"

data/tasks/bower.rake

@@ -15,14 +15,11 @@ namespace :bower do
     require 'bootstrap-sass'
     Dir.chdir Bootstrap.gem_path do
       spec       = JSON.parse(File.read 'bower.json')
-      js_paths   = File.read(File.join Bootstrap.javascripts_path, 'bootstrap-sprockets.js').lines.map do |line|
-        line.strip if line.sub!(%r(//\s*=\s*require\s*(?:./)?(.*)\s*), 'assets/javascripts/\1.js')
-      end.compact
 
       spec['main'] =
           find_files.(File.join(Bootstrap.stylesheets_path, '_bootstrap.scss')) +
           find_files.(Bootstrap.fonts_path) +
-          js_paths
+          %w(assets/javascripts/bootstrap.js)
 
       spec['version'] = Bootstrap::VERSION[0..-3]
 

data/tasks/converter.rb

@@ -50,7 +50,7 @@ class Converter
   def_delegators :@logger, :log, :log_status, :log_processing, :log_transform, :log_file_info, :log_processed, :log_http_get_file, :log_http_get_files, :silence_log
 
   def process_bootstrap
-    log_status "Convert Bootstrap LESS to SASS"
+    log_status "Convert Bootstrap LESS to Sass"
     puts " repo   : #@repo_url"
     puts " branch : #@branch_sha #@repo_url/tree/#@branch"
     puts " save to: #{@save_to.to_json}"

data/tasks/converter/fonts_conversion.rb

@@ -10,7 +10,7 @@ class Converter
     end
 
     def bootstrap_font_files
-      @bootstrap_font_files ||= get_paths_by_type('fonts', /\.(eot|svg|ttf|woff)$/)
+      @bootstrap_font_files ||= get_paths_by_type('fonts', /\.(eot|svg|ttf|woff2?)$/)
     end
   end
 end

data/tasks/converter/js_conversion.rb

@@ -12,14 +12,16 @@ class Converter
 
       log_status 'Updating javascript manifest'
       manifest = ''
-      cat = ''
       bootstrap_js_files.each do |name|
-        cat << contents[name] + "\n"
         name = name.gsub(/\.js$/, '')
         manifest << "//= require ./bootstrap/#{name}\n"
       end
-      {'assets/javascripts/bootstrap-sprockets.js' => manifest,
-       'assets/javascripts/bootstrap.js' => cat}.each do |path, content|
+      dist_js = read_files('dist/js', %w(bootstrap.js bootstrap.min.js))
+      {
+          'assets/javascripts/bootstrap-sprockets.js' => manifest,
+          'assets/javascripts/bootstrap.js'           => dist_js['bootstrap.js'],
+          'assets/javascripts/bootstrap.min.js'       => dist_js['bootstrap.min.js'],
+      }.each do |path, content|
         save_file path, content
         log_processed path
       end

data/tasks/converter/less_conversion.rb

@@ -95,14 +95,10 @@ class Converter
             file = apply_mixin_parent_selector file, '\.(?:visible|hidden)'
           when 'variables.less'
             file = insert_default_vars(file)
-            file = unindent <<-SCSS + "\n" + file, 14
-              // When true, asset path helpers are used, otherwise the regular CSS `url()` is used.
-              // When there no function is defined, `fn('')` is parsed as string that equals the right hand side
-              // NB: in Sass 3.3 there is a native function: function-exists(twbs-font-path)
-              $bootstrap-sass-asset-helper: #{sass_fn_exists('twbs-font-path')} !default;
-            SCSS
+            file = ['$bootstrap-sass-asset-helper: false !default;', file].join("\n")
             file = replace_all file, %r{(\$icon-font-path): \s*"(.*)" (!default);}, "\n" + unindent(<<-SCSS, 14)
-              // [converter] Asset helpers such as Sprockets and Node.js Mincer do not resolve relative paths
+              // [converter] If $bootstrap-sass-asset-helper if used, provide path relative to the assets load path.
+              // [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 'close.less'
@@ -114,6 +110,9 @@ class Converter
           when 'forms.less'
             file = extract_nested_rule file, 'textarea&'
             file = apply_mixin_parent_selector(file, '\.input-(?:sm|lg)')
+            file = replace_rules file, /\.form-group-(?:sm|lg)/ do |rule|
+              apply_mixin_parent_selector rule, '.form-control'
+            end
           when 'navbar.less'
             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'
@@ -146,7 +145,7 @@ class Converter
       # generate variables template
       save_file 'templates/project/_bootstrap-variables.sass',
                 "// Override Bootstrap variables here (defaults from bootstrap-sass v#{Bootstrap::VERSION}):\n\n" +
-                    File.read("#{save_to}/_variables.scss").gsub(/^(?=\$)/, '// ').gsub(/ !default;/, '')
+                    File.read("#{save_to}/_variables.scss").lines[1..-1].join.gsub(/^(?=\$)/, '// ').gsub(/ !default;/, '')
     end
 
     def bootstrap_less_files
@@ -171,6 +170,7 @@ class Converter
       file   = deinterpolate_vararg_mixins(file)
       file   = replace_calculation_semantics(file)
       file   = replace_file_imports(file)
+      file   = unquote_utf8_escape_sequences(file)
       file
     end
 
@@ -206,7 +206,7 @@ class Converter
 SASS
     end
 
-    # convert grid mixins LESS when => SASS @if
+    # convert grid mixins LESS when => Sass @if
     def convert_grid_mixins(file)
       file = replace_rules file, /@mixin make-grid-columns/, comments: false do |css, pos|
         mixin_all_grid_columns css, selector: '.col-xs-#{$i}, .col-sm-#{$i}, .col-md-#{$i}, .col-lg-#{$i}', to: '$grid-columns'
@@ -263,8 +263,8 @@ SASS
 
     # margin: a -b
     # LESS: sets 2 values
-    # SASS: sets 1 value (a-b)
-    # This wraps a and -b so they evaluates to 2 values in SASS
+    # Sass: sets 1 value (a-b)
+    # This wraps a and -b so they evaluates to 2 values in Sass
     def replace_calculation_semantics(file)
       # split_prop_val.call('(@navbar-padding-vertical / 2) -@navbar-padding-horizontal')
       # #=> ["(navbar-padding-vertical / 2)", "-navbar-padding-horizontal"]
@@ -315,6 +315,12 @@ SASS
                 %Q(@import "#{target_path}\\1";)
     end
 
+    # Unquote escape sequences, e.g. content: "#{$sep}\00a0" to content: #{$sep}\00a0
+    # Works around Sass 3.4 issue: https://github.com/sass/sass/issues/1395
+    def unquote_utf8_escape_sequences(scss)
+      scss.gsub /\"((?:#\{[^}]+\})?\\[a-f0-9]{4,}?)\"/, '\1'
+    end
+
     def replace_all(file, regex, replacement = nil, &block)
       log_transform regex, replacement
       new_file = file.gsub(regex, replacement, &block)
@@ -384,8 +390,10 @@ SASS
         end
         # unwrap, and replace @include
         unindent unwrap_rule_block(rule).gsub(/(@include [\w-]+)\(?([\$\w\-,\s]*)\)?/) {
-          args = $2
-          "#{cmt}#{$1}('#{sel.gsub(/\s+/, ' ')}'#{', ' if args && !args.empty?}#{args})"
+          name, args = $1, $2
+          sel.gsub(/\s+/, ' ').split(/,\s*/ ).map { |sel_part|
+            "#{cmt}#{name}('#{sel_part}'#{', ' if args && !args.empty?}#{args})"
+          }.join(";\n")
         }
       end
     end
@@ -449,7 +457,7 @@ SASS
       end
     end
 
-    # change Microsoft filters to SASS calling convention
+    # change Microsoft filters to Sass calling convention
     def replace_ms_filters(file)
       log_transform
       file.gsub(
@@ -497,7 +505,7 @@ SASS
     end
 
     def replace_escaping(less)
-      less = less.gsub(/~"([^"]+)"/, '#{\1}') # Get rid of ~"" escape
+      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}")
       less.gsub(/(\W)e\(%\("?([^"]*)"?\)\)/, '\1\2') # Get rid of e(%("")) escape