rake convert

7 files changed, 9 insertions, 5 deletions

diff --git a/lib/bootstrap-sass/version.rb b/lib/bootstrap-sass/version.rb
index 32f22368..ee3f8d68 100644
--- a/lib/bootstrap-sass/version.rb
+++ b/lib/bootstrap-sass/version.rb
@@ -1,4 +1,4 @@
 module Bootstrap
   VERSION = '3.1.1.0'
-  BOOTSTRAP_SHA = 'd74aee409342d086ae6b087ea6dc3e71f6da055c'
+  BOOTSTRAP_SHA = '1d6187956f3a0ae0a3527da533b21608b9e18c3e'
 end
diff --git a/vendor/assets/javascripts/bootstrap/carousel.js b/vendor/assets/javascripts/bootstrap/carousel.js
index 19e9af1e..6d6fa0ae 100644
--- a/vendor/assets/javascripts/bootstrap/carousel.js
+++ b/vendor/assets/javascripts/bootstrap/carousel.js
@@ -48,7 +48,7 @@
 
   Carousel.prototype.getActiveIndex = function () {
     this.$active = this.$element.find('.item.active')
-    this.$items  = this.$active.parent().children()
+    this.$items  = this.$active.parent().children('.item')
 
     return this.$items.index(this.$active)
   }
diff --git a/vendor/assets/javascripts/bootstrap/popover.js b/vendor/assets/javascripts/bootstrap/popover.js
index 23aa8298..9cf9f711 100644
--- a/vendor/assets/javascripts/bootstrap/popover.js
+++ b/vendor/assets/javascripts/bootstrap/popover.js
@@ -44,7 +44,7 @@
     var content = this.getContent()
 
     $tip.find('.popover-title')[this.options.html ? 'html' : 'text'](title)
-    $tip.find('.popover-content')[ // we use append for html objects to maintain js events
+    $tip.find('.popover-content').empty()[ // we use append for html objects to maintain js events
       this.options.html ? (typeof content == 'string' ? 'html' : 'append') : 'text'
     ](content)
 
diff --git a/vendor/assets/stylesheets/bootstrap/_dropdowns.scss b/vendor/assets/stylesheets/bootstrap/_dropdowns.scss
index 526be5b8..803a798f 100644
--- a/vendor/assets/stylesheets/bootstrap/_dropdowns.scss
+++ b/vendor/assets/stylesheets/bootstrap/_dropdowns.scss
@@ -38,6 +38,7 @@
   margin: 2px 0 0; // override default ul
   list-style: none;
   font-size: $font-size-base;
+  text-align: left; // Ensures proper alignment if parent has it changed (e.g., modal footer)
   background-color: $dropdown-bg;
   border: 1px solid $dropdown-fallback-border; // IE8 fallback
   border: 1px solid $dropdown-border;
diff --git a/vendor/assets/stylesheets/bootstrap/_forms.scss b/vendor/assets/stylesheets/bootstrap/_forms.scss
index b41c7e66..310c24dd 100644
--- a/vendor/assets/stylesheets/bootstrap/_forms.scss
+++ b/vendor/assets/stylesheets/bootstrap/_forms.scss
@@ -31,6 +31,7 @@ legend {
 
 label {
   display: inline-block;
+  max-width: 100%; // Force IE8 to wrap long content (see https://github.com/twbs/bootstrap/issues/13141)
   margin-bottom: 5px;
   font-weight: bold;
 }
@@ -289,6 +290,7 @@ input[type="checkbox"],
   position: absolute;
   top: ($line-height-computed + 5); // Height of the `label` and its margin
   right: 0;
+  z-index: 2; // Ensure icon is above input groups
   display: block;
   width: $input-height-base;
   height: $input-height-base;
diff --git a/vendor/assets/stylesheets/bootstrap/mixins/_buttons.scss b/vendor/assets/stylesheets/bootstrap/mixins/_buttons.scss
index 7c0c989d..58ad13e5 100644
--- a/vendor/assets/stylesheets/bootstrap/mixins/_buttons.scss
+++ b/vendor/assets/stylesheets/bootstrap/mixins/_buttons.scss
@@ -12,14 +12,14 @@
   &:focus,
   &:active,
   &.active,
-  .open &.dropdown-toggle {
+  .open > &.dropdown-toggle {
     color: $color;
     background-color: darken($background, 10%);
         border-color: darken($border, 12%);
   }
   &:active,
   &.active,
-  .open &.dropdown-toggle {
+  .open > &.dropdown-toggle {
     background-image: none;
   }
   &.disabled,
diff --git a/vendor/assets/stylesheets/bootstrap/mixins/_table-row.scss b/vendor/assets/stylesheets/bootstrap/mixins/_table-row.scss
index 0680006d..13679508 100644
--- a/vendor/assets/stylesheets/bootstrap/mixins/_table-row.scss
+++ b/vendor/assets/stylesheets/bootstrap/mixins/_table-row.scss
@@ -20,6 +20,7 @@
     > td.#{$state}:hover,
     > th.#{$state}:hover,
     &.#{$state}:hover > td,
+    &:hover > .#{$state},
     &.#{$state}:hover > th {
       background-color: darken($background, 5%);
     }