Merge branch '2.0.4.1'v2.0.4.1

8 files changed, 20 insertions, 19 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e72e7a26..5a9cf6e3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Changelog
 
+## 2.0.4.1
+* Fix `.row-fluid > spanX` nesting
+* Small Javascript fixes for those staying on the 2.0.4 release
+* Add `!default` to z-index variables.
+
 ## 2.0.4.0
 * Updated to Bootstrap 2.0.4
 * Switched to Bootstrap 2.0.3+'s method of separating responsive files
diff --git a/README.md b/README.md
index 4d434890..cdbbe725 100644
--- a/README.md
+++ b/README.md
@@ -16,7 +16,7 @@ Updating your application to a new version of `bootstrap-sass`? See our [changel
 In your Gemfile:
 
     gem 'sass-rails', '~> 3.1'
-    gem 'bootstrap-sass', '~> 2.0.4.0'
+    gem 'bootstrap-sass', '~> 2.0.4.1'
 
 #### CSS
 
diff --git a/bootstrap-sass.gemspec b/bootstrap-sass.gemspec
index 3f95f7ac..a5582475 100644
--- a/bootstrap-sass.gemspec
+++ b/bootstrap-sass.gemspec
@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "bootstrap-sass"
-  s.version = '2.0.4.0'
+  s.version = '2.0.4.1'
   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"
diff --git a/vendor/assets/javascripts/bootstrap-transition.js b/vendor/assets/javascripts/bootstrap-transition.js
index 53418262..2f15dd00 100644
--- a/vendor/assets/javascripts/bootstrap-transition.js
+++ b/vendor/assets/javascripts/bootstrap-transition.js
@@ -36,7 +36,7 @@
           , transEndEventNames = {
                'WebkitTransition' : 'webkitTransitionEnd'
             ,  'MozTransition'    : 'transitionend'
-            ,  'OTransition'      : 'oTransitionEnd'
+            ,  'OTransition'      : 'otransitionend'
             ,  'msTransition'     : 'MSTransitionEnd'
             ,  'transition'       : 'transitionend'
             }
diff --git a/vendor/assets/javascripts/bootstrap-typeahead.js b/vendor/assets/javascripts/bootstrap-typeahead.js
index ad44b908..6a2abb17 100644
--- a/vendor/assets/javascripts/bootstrap-typeahead.js
+++ b/vendor/assets/javascripts/bootstrap-typeahead.js
@@ -168,7 +168,7 @@
         .on('keypress', $.proxy(this.keypress, this))
         .on('keyup',    $.proxy(this.keyup, this))
 
-      if ($.browser.webkit || $.browser.msie) {
+      if ($.browser.webkit || $.browser.msie || $.browser.mozilla) {
         this.$element.on('keydown', $.proxy(this.keypress, this))
       }
 
diff --git a/vendor/assets/stylesheets/bootstrap/_forms.scss b/vendor/assets/stylesheets/bootstrap/_forms.scss
index 951b3dee..dc155104 100644
--- a/vendor/assets/stylesheets/bootstrap/_forms.scss
+++ b/vendor/assets/stylesheets/bootstrap/_forms.scss
@@ -381,7 +381,7 @@ input:focus:required:invalid, textarea:focus:required:invalid, select:focus:requ
 // SEARCH FORM
 // -----------
 
-.search-query {
+input.search-query { // input. fix the overwriting of the search-query and allow rounded corner for the search field
   padding-right: 14px;
   padding-right: 4px \9;
   padding-left: 14px;
diff --git a/vendor/assets/stylesheets/bootstrap/_mixins.scss b/vendor/assets/stylesheets/bootstrap/_mixins.scss
index 54ecd6cd..245ba0d5 100644
--- a/vendor/assets/stylesheets/bootstrap/_mixins.scss
+++ b/vendor/assets/stylesheets/bootstrap/_mixins.scss
@@ -585,14 +585,10 @@
     [class*="span"]:first-child {
       margin-left: 0;
     }
-
-    // generate .spanX
-    @include gridFluidSpanX($gridColumns, $columnWidth, $gutterWidth);
   }
-}
-@mixin gridFluidSpanX($cols, $columnWidth, $gutterWidth) {
-  @for $i from 1 through $cols {
-    .span#{$i} { @include gridFluidSpan($i, $columnWidth, $gutterWidth) };
+  // generate .row-fluid > .spanX
+  @for $i from 1 through $gridColumns {
+    .row-fluid > .span#{$i} { @include gridFluidSpan($i, $columnWidth, $gutterWidth) };
   }
 }
 @mixin gridFluidSpan($columns, $columnWidth, $gutterWidth) {
@@ -622,4 +618,4 @@
   float: left;
   margin-left: $gutterWidth;
   @include gridFluidSpan($columns, $columnWidth, $gutterWidth);
-}
\ No newline at end of file
+}
diff --git a/vendor/assets/stylesheets/bootstrap/_variables.scss b/vendor/assets/stylesheets/bootstrap/_variables.scss
index b1dc27d9..37c3d89c 100644
--- a/vendor/assets/stylesheets/bootstrap/_variables.scss
+++ b/vendor/assets/stylesheets/bootstrap/_variables.scss
@@ -114,12 +114,12 @@ $dropdownDividerBottom: $white !default;
 // -------------------------
 // Used for a bird's eye view of components dependent on the z-axis
 // Try to avoid customizing these :)
-$zindexDropdown:          1000;
-$zindexPopover:           1010;
-$zindexTooltip:           1020;
-$zindexFixedNavbar:       1030;
-$zindexModalBackdrop:     1040;
-$zindexModal:             1050;
+$zindexDropdown:          1000 !default;
+$zindexPopover:           1010 !default;
+$zindexTooltip:           1020 !default;
+$zindexFixedNavbar:       1030 !default;
+$zindexModalBackdrop:     1040 !default;
+$zindexModal:             1050 !default;
 
 
 // Sprite icons path