update to v3.0.2.0v3.0.2.0

18 files changed, 84 insertions, 82 deletions

diff --git a/lib/bootstrap-sass/version.rb b/lib/bootstrap-sass/version.rb
index c7c74f66..86ec7608 100644
--- a/lib/bootstrap-sass/version.rb
+++ b/lib/bootstrap-sass/version.rb
@@ -1,4 +1,4 @@
 module Bootstrap
-  VERSION = '3.0.1.0'
-  BOOTSTRAP_SHA = 'ea3c89189a6b922c08729857006713de209b66d8'
+  VERSION = '3.0.2.0'
+  BOOTSTRAP_SHA = '463343af63344dbbc3db04f40b0b804baa919b7e'
 end
diff --git a/tasks/converter/less_conversion.rb b/tasks/converter/less_conversion.rb
index 878ad4c9..fc2e315d 100644
--- a/tasks/converter/less_conversion.rb
+++ b/tasks/converter/less_conversion.rb
@@ -71,12 +71,6 @@ class Converter
           when 'close.less'
             # extract .close { button& {...} } rule
             file = extract_nested_rule file, 'button&'
-          when 'modals.less'
-            # pre 3.0.1:
-            if file =~ /body&,/
-             file = replace_all file, /body&,(.*?)(\{.*?\})/m, "\\1\\2\nbody& \\2"
-             file = extract_nested_rule file, 'body&'
-            end
           when 'dropdowns.less'
             file = replace_all file, /(\s*)@extend \.pull-right-dropdown-menu;/, "\\1right: 0;\\1left: auto;"
           when 'forms.less'
@@ -86,7 +80,7 @@ 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 'list-group.less'
+          when 'thumbnails.less'
             file = extract_nested_rule file, 'a&'
           when 'glyphicons.less'
             file = replace_rules(file, '@font-face') { |rule|
@@ -137,11 +131,11 @@ class Converter
         // [converter] Grid converted to use SASS cycles (LESS uses recursive nested mixin defs not supported by SASS)
         #{mxn_def.strip}
           $list: '';
-          @for $i from 1 to $grid-columns {
+          $i: 1;
+          $list: "#{classes}";
+          @for $i from 2 through $grid-columns {
             $list: "#{classes}, \#{$list}";
           }
-          $i: $grid-columns;
-          $list: "\#{$list}, #{classes}";
           \#{$list} {
         #{unindent body}
           }
@@ -149,7 +143,7 @@ class Converter
         SASS
       end
       file = replace_rules file, /@mixin calc-grid/ do |css|
-        css = indent css.gsub(/.*when \((.*?)\) {/, '@if \1 {').gsub(/(?<=\$type) = (\w+)/, ' == \1').gsub(/(?<=-)(\$[a-z]+)/, '#{\1}')
+        css = indent css.gsub(/.*when (.*?) {/, '@if \1 {').gsub(/(?<=\$type) = (\w+)/, ' == \1').gsub(/(?<=-)(\$[a-z]+)/, '#{\1}')
         if css =~ /== width/
           css = "@mixin calc-grid($index, $class, $type) {\n#{css}"
         elsif css =~ /== offset/
@@ -161,7 +155,7 @@ class Converter
         unindent <<-SASS, 8
         // [converter] This is defined recursively in LESS, but SASS supports real loops
         @mixin make-grid($columns, $class, $type) {
-          @for $i from 1 through $columns {
+          @for $i from 0 through $columns {
             @include calc-grid($i, $class, $type);
           }
         }
@@ -283,9 +277,10 @@ class Converter
       # first find the rules, and remove them
       file    = replace_rules(file, "\s*#{selector}", comments: true) { |rule, pos, css|
         matches << [rule, pos]
-        new_selector ||= "#{get_selector(rule).sub(/&$/, '')}#{selector_for_pos(css, pos.begin)}"
-        indent "// [converter] extracted #{get_selector(rule)} to #{new_selector}", indent_width(rule)
+        new_selector ||= "#{get_selector(rule).gsub(/&/, selector_for_pos(css, pos.begin))}"
+        indent "// [converter] extracted #{get_selector(rule)} to #{new_selector}".tr("\n", ' ').squeeze(' '), indent_width(rule)
       }
+      raise "extract_nested_rule: no such selector: #{selector}" if matches.empty?
       log_transform selector, new_selector
       # replace rule selector with new_selector
       matches.each do |m|
diff --git a/vendor/assets/javascripts/bootstrap/affix.js b/vendor/assets/javascripts/bootstrap/affix.js
index c7910373..7d111ecc 100644
--- a/vendor/assets/javascripts/bootstrap/affix.js
+++ b/vendor/assets/javascripts/bootstrap/affix.js
@@ -1,5 +1,5 @@
 /* ========================================================================
- * Bootstrap: affix.js v3.0.1
+ * Bootstrap: affix.js v3.0.2
  * http://getbootstrap.com/javascript/#affix
  * ========================================================================
  * Copyright 2013 Twitter, Inc.
@@ -123,4 +123,4 @@
     })
   })
 
-}(window.jQuery);
+}(jQuery);
diff --git a/vendor/assets/javascripts/bootstrap/alert.js b/vendor/assets/javascripts/bootstrap/alert.js
index 25bc67c2..031d72aa 100644
--- a/vendor/assets/javascripts/bootstrap/alert.js
+++ b/vendor/assets/javascripts/bootstrap/alert.js
@@ -1,5 +1,5 @@
 /* ========================================================================
- * Bootstrap: alert.js v3.0.1
+ * Bootstrap: alert.js v3.0.2
  * http://getbootstrap.com/javascript/#alerts
  * ========================================================================
  * Copyright 2013 Twitter, Inc.
@@ -95,4 +95,4 @@
 
   $(document).on('click.bs.alert.data-api', dismiss, Alert.prototype.close)
 
-}(window.jQuery);
+}(jQuery);
diff --git a/vendor/assets/javascripts/bootstrap/button.js b/vendor/assets/javascripts/bootstrap/button.js
index 8a518cb0..0145689d 100644
--- a/vendor/assets/javascripts/bootstrap/button.js
+++ b/vendor/assets/javascripts/bootstrap/button.js
@@ -1,5 +1,5 @@
 /* ========================================================================
- * Bootstrap: button.js v3.0.1
+ * Bootstrap: button.js v3.0.2
  * http://getbootstrap.com/javascript/#buttons
  * ========================================================================
  * Copyright 2013 Twitter, Inc.
@@ -106,4 +106,4 @@
     e.preventDefault()
   })
 
-}(window.jQuery);
+}(jQuery);
diff --git a/vendor/assets/javascripts/bootstrap/carousel.js b/vendor/assets/javascripts/bootstrap/carousel.js
index 8c580b81..902d4d78 100644
--- a/vendor/assets/javascripts/bootstrap/carousel.js
+++ b/vendor/assets/javascripts/bootstrap/carousel.js
@@ -1,5 +1,5 @@
 /* ========================================================================
- * Bootstrap: carousel.js v3.0.1
+ * Bootstrap: carousel.js v3.0.2
  * http://getbootstrap.com/javascript/#carousel
  * ========================================================================
  * Copyright 2013 Twitter, Inc.
@@ -214,4 +214,4 @@
     })
   })
 
-}(window.jQuery);
+}(jQuery);
diff --git a/vendor/assets/javascripts/bootstrap/collapse.js b/vendor/assets/javascripts/bootstrap/collapse.js
index c89de982..9967b167 100644
--- a/vendor/assets/javascripts/bootstrap/collapse.js
+++ b/vendor/assets/javascripts/bootstrap/collapse.js
@@ -1,5 +1,5 @@
 /* ========================================================================
- * Bootstrap: collapse.js v3.0.1
+ * Bootstrap: collapse.js v3.0.2
  * http://getbootstrap.com/javascript/#collapse
  * ========================================================================
  * Copyright 2013 Twitter, Inc.
@@ -176,4 +176,4 @@
     $target.collapse(option)
   })
 
-}(window.jQuery);
+}(jQuery);
diff --git a/vendor/assets/javascripts/bootstrap/dropdown.js b/vendor/assets/javascripts/bootstrap/dropdown.js
index 5680791c..d5da638d 100644
--- a/vendor/assets/javascripts/bootstrap/dropdown.js
+++ b/vendor/assets/javascripts/bootstrap/dropdown.js
@@ -1,5 +1,5 @@
 /* ========================================================================
- * Bootstrap: dropdown.js v3.0.1
+ * Bootstrap: dropdown.js v3.0.2
  * http://getbootstrap.com/javascript/#dropdowns
  * ========================================================================
  * Copyright 2013 Twitter, Inc.
@@ -151,4 +151,4 @@
     .on('click.bs.dropdown.data-api'  , toggle, Dropdown.prototype.toggle)
     .on('keydown.bs.dropdown.data-api', toggle + ', [role=menu]' , Dropdown.prototype.keydown)
 
-}(window.jQuery);
+}(jQuery);
diff --git a/vendor/assets/javascripts/bootstrap/modal.js b/vendor/assets/javascripts/bootstrap/modal.js
index d5e11296..dac50c6c 100644
--- a/vendor/assets/javascripts/bootstrap/modal.js
+++ b/vendor/assets/javascripts/bootstrap/modal.js
@@ -1,5 +1,5 @@
 /* ========================================================================
- * Bootstrap: modal.js v3.0.1
+ * Bootstrap: modal.js v3.0.2
  * http://getbootstrap.com/javascript/#modals
  * ========================================================================
  * Copyright 2013 Twitter, Inc.
@@ -243,4 +243,4 @@
     .on('show.bs.modal',  '.modal', function () { $(document.body).addClass('modal-open') })
     .on('hidden.bs.modal', '.modal', function () { $(document.body).removeClass('modal-open') })
 
-}(window.jQuery);
+}(jQuery);
diff --git a/vendor/assets/javascripts/bootstrap/popover.js b/vendor/assets/javascripts/bootstrap/popover.js
index f2ba5be0..35b48855 100644
--- a/vendor/assets/javascripts/bootstrap/popover.js
+++ b/vendor/assets/javascripts/bootstrap/popover.js
@@ -1,5 +1,5 @@
 /* ========================================================================
- * Bootstrap: popover.js v3.0.1
+ * Bootstrap: popover.js v3.0.2
  * http://getbootstrap.com/javascript/#popovers
  * ========================================================================
  * Copyright 2013 Twitter, Inc.
@@ -114,4 +114,4 @@
     return this
   }
 
-}(window.jQuery);
+}(jQuery);
diff --git a/vendor/assets/javascripts/bootstrap/scrollspy.js b/vendor/assets/javascripts/bootstrap/scrollspy.js
index 19ed6fcd..1d2fc785 100644
--- a/vendor/assets/javascripts/bootstrap/scrollspy.js
+++ b/vendor/assets/javascripts/bootstrap/scrollspy.js
@@ -1,5 +1,5 @@
 /* ========================================================================
- * Bootstrap: scrollspy.js v3.0.1
+ * Bootstrap: scrollspy.js v3.0.2
  * http://getbootstrap.com/javascript/#scrollspy
  * ========================================================================
  * Copyright 2013 Twitter, Inc.
@@ -155,4 +155,4 @@
     })
   })
 
-}(window.jQuery);
+}(jQuery);
diff --git a/vendor/assets/javascripts/bootstrap/tab.js b/vendor/assets/javascripts/bootstrap/tab.js
index 87dae645..c803b89b 100644
--- a/vendor/assets/javascripts/bootstrap/tab.js
+++ b/vendor/assets/javascripts/bootstrap/tab.js
@@ -1,5 +1,5 @@
 /* ========================================================================
- * Bootstrap: tab.js v3.0.1
+ * Bootstrap: tab.js v3.0.2
  * http://getbootstrap.com/javascript/#tabs
  * ========================================================================
  * Copyright 2013 Twitter, Inc.
@@ -132,4 +132,4 @@
     $(this).tab('show')
   })
 
-}(window.jQuery);
+}(jQuery);
diff --git a/vendor/assets/javascripts/bootstrap/tooltip.js b/vendor/assets/javascripts/bootstrap/tooltip.js
index 68078d05..9e617755 100644
--- a/vendor/assets/javascripts/bootstrap/tooltip.js
+++ b/vendor/assets/javascripts/bootstrap/tooltip.js
@@ -1,5 +1,5 @@
 /* ========================================================================
- * Bootstrap: tooltip.js v3.0.1
+ * Bootstrap: tooltip.js v3.0.2
  * http://getbootstrap.com/javascript/#tooltip
  * Inspired by the original jQuery.tipsy by Jason Frame
  * ========================================================================
@@ -383,4 +383,4 @@
     return this
   }
 
-}(window.jQuery);
+}(jQuery);
diff --git a/vendor/assets/javascripts/bootstrap/transition.js b/vendor/assets/javascripts/bootstrap/transition.js
index bf6c7329..a692dfda 100644
--- a/vendor/assets/javascripts/bootstrap/transition.js
+++ b/vendor/assets/javascripts/bootstrap/transition.js
@@ -1,5 +1,5 @@
 /* ========================================================================
- * Bootstrap: transition.js v3.0.1
+ * Bootstrap: transition.js v3.0.2
  * http://getbootstrap.com/javascript/#transitions
  * ========================================================================
  * Copyright 2013 Twitter, Inc.
@@ -53,4 +53,4 @@
     $.support.transition = transitionEnd()
   })
 
-}(window.jQuery);
+}(jQuery);
diff --git a/vendor/assets/stylesheets/bootstrap/_forms.scss b/vendor/assets/stylesheets/bootstrap/_forms.scss
index 7a954b54..a4b27dc7 100644
--- a/vendor/assets/stylesheets/bootstrap/_forms.scss
+++ b/vendor/assets/stylesheets/bootstrap/_forms.scss
@@ -92,14 +92,6 @@ output {
   vertical-align: middle;
 }
 
-// Placeholder
-//
-// Placeholder text gets special styles because when browsers invalidate entire
-// lines if it doesn't understand a selector/
-.form-control {
-  @include placeholder();
-}
-
 
 // Common form controls
 //
@@ -142,6 +134,12 @@ output {
   // Customize the `:focus` state to imitate native WebKit styles.
   @include form-control-focus();
 
+  // Placeholder
+  //
+  // Placeholder text gets special styles because when browsers invalidate entire
+  // lines if it doesn't understand a selector/
+  @include placeholder();
+
   // Disabled and read-only inputs
   // Note: HTML5 says that controls under a fieldset > legend:first-child won't
   // be disabled if the fieldset is disabled. Due to implementation difficulty,
diff --git a/vendor/assets/stylesheets/bootstrap/_mixins.scss b/vendor/assets/stylesheets/bootstrap/_mixins.scss
index 53d9ed43..f6275ed0 100644
--- a/vendor/assets/stylesheets/bootstrap/_mixins.scss
+++ b/vendor/assets/stylesheets/bootstrap/_mixins.scss
@@ -720,11 +720,11 @@
 // [converter] Grid converted to use SASS cycles (LESS uses recursive nested mixin defs not supported by SASS)
 @mixin make-grid-columns() {
   $list: '';
-  @for $i from 1 to $grid-columns {
+  $i: 1;
+  $list: ".col-xs-#{$i}, .col-sm-#{$i}, .col-md-#{$i}, .col-lg-#{$i}";
+  @for $i from 2 through $grid-columns {
     $list: ".col-xs-#{$i}, .col-sm-#{$i}, .col-md-#{$i}, .col-lg-#{$i}, #{$list}";
   }
-  $i: $grid-columns;
-  $list: "#{$list}, .col-xs-#{$i}, .col-sm-#{$i}, .col-md-#{$i}, .col-lg-#{$i}";
   #{$list} {
     position: relative;
     // Prevent columns from collapsing when empty
@@ -739,11 +739,11 @@
 // [converter] Grid converted to use SASS cycles (LESS uses recursive nested mixin defs not supported by SASS)
 @mixin make-grid-columns-float($class) {
   $list: '';
-  @for $i from 1 to $grid-columns {
+  $i: 1;
+  $list: ".col-#{$class}-#{$i}";
+  @for $i from 2 through $grid-columns {
     $list: ".col-#{$class}-#{$i}, #{$list}";
   }
-  $i: $grid-columns;
-  $list: "#{$list}, .col-#{$class}-#{$i}";
   #{$list} {
     float: left;
   }
@@ -751,22 +751,22 @@
 
 
 @mixin calc-grid($index, $class, $type) {
-  @if $type == width {
+  @if ($type == width) and ($index > 0) {
     .col-#{$class}-#{$index} {
       width: percentage(($index / $grid-columns));
     }
   }
-  @if $type == push {
+  @if ($type == push) {
     .col-#{$class}-push-#{$index} {
       left: percentage(($index / $grid-columns));
     }
   }
-  @if $type == pull {
+  @if ($type == pull) {
     .col-#{$class}-pull-#{$index} {
       right: percentage(($index / $grid-columns));
     }
   }
-  @if $type == offset {
+  @if ($type == offset) {
     .col-#{$class}-offset-#{$index} {
       margin-left: percentage(($index / $grid-columns));
     }
@@ -775,7 +775,7 @@
 
 // [converter] This is defined recursively in LESS, but SASS supports real loops
 @mixin make-grid($columns, $class, $type) {
-  @for $i from 1 through $columns {
+  @for $i from 0 through $columns {
     @include calc-grid($i, $class, $type);
   }
 }
diff --git a/vendor/assets/stylesheets/bootstrap/_tables.scss b/vendor/assets/stylesheets/bootstrap/_tables.scss
index 44ec51a8..768d9aaf 100644
--- a/vendor/assets/stylesheets/bootstrap/_tables.scss
+++ b/vendor/assets/stylesheets/bootstrap/_tables.scss
@@ -104,10 +104,12 @@ th {
 //
 // Default zebra-stripe styles (alternating gray and transparent backgrounds)
 
-.table-striped > tbody > tr:nth-child(odd) {
-  > td,
-  > th {
-    background-color: $table-bg-accent;
+.table-striped {
+  > tbody > tr:nth-child(odd) {
+    > td,
+    > th {
+      background-color: $table-bg-accent;
+    }
   }
 }
 
@@ -116,10 +118,12 @@ th {
 //
 // Placed here since it has to come after the potential zebra striping
 
-.table-hover > tbody > tr:hover {
-  > td,
-  > th {
-    background-color: $table-bg-hover;
+.table-hover {
+  > tbody > tr:hover {
+    > td,
+    > th {
+      background-color: $table-bg-hover;
+    }
   }
 }
 
@@ -148,14 +152,18 @@ table {
 // Exact selectors below required to override `.table-striped` and prevent
 // inheritance to nested tables.
 
-.table > thead > tr,
-.table > tbody > tr,
-.table > tfoot > tr {
-  > td.active,
-  > th.active,
-  &.active > td,
-  &.active > th  {
-    background-color: $table-bg-active;
+.table {
+  > thead,
+  > tbody,
+  > tfoot {
+    > tr {
+      > td.active,
+      > th.active,
+      &.active > td,
+      &.active > th  {
+        background-color: $table-bg-active;
+      }
+    }
   }
 }
 
diff --git a/vendor/assets/stylesheets/bootstrap/_thumbnails.scss b/vendor/assets/stylesheets/bootstrap/_thumbnails.scss
index 6f118ecf..8aa42fb2 100644
--- a/vendor/assets/stylesheets/bootstrap/_thumbnails.scss
+++ b/vendor/assets/stylesheets/bootstrap/_thumbnails.scss
@@ -14,8 +14,15 @@
     margin-left: auto;
     margin-right: auto;
   }
-}
 
+  // [converter] extracted a&:hover, a&:focus, a&.active to a.thumbnail:hover, a.thumbnail:focus, a.thumbnail.active
+
+  // Image captions
+  .caption {
+    padding: $thumbnail-caption-padding;
+    color: $thumbnail-caption-color;
+  }
+}
 
 // Add a hover state for linked versions only
 a.thumbnail:hover,
@@ -23,9 +30,3 @@ a.thumbnail:focus,
 a.thumbnail.active {
   border-color: $link-color;
 }
-
-// Image captions
-.thumbnail .caption {
-  padding: $thumbnail-caption-padding;
-  color: $thumbnail-caption-color;
-}