rake convert

twbs · Feb 13, 2014 · 9b9365f · 9b9365f
1 parent 041b093
commit 9b9365f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/lib/bootstrap-sass/version.rb b/lib/bootstrap-sass/version.rb
@@ -1,4 +1,4 @@
 module Bootstrap
   VERSION = '3.1.0.2'
-  BOOTSTRAP_SHA = '24bf4398802098097875a11f69dfd750a0550c87'
+  BOOTSTRAP_SHA = 'd8cfcad7c71a2b65325b36718c218fee4221e663'
 end
diff --git a/vendor/assets/stylesheets/bootstrap/_input-groups.scss b/vendor/assets/stylesheets/bootstrap/_input-groups.scss
@@ -17,6 +17,11 @@
   }
 
   .form-control {
+    // Ensure that the input is always above the *appended* addon button for
+    // proper border colors.
+    position: relative;
+    z-index: 2;
+
     // IE9 fubars the placeholder attribute in text inputs and the arrows on
     // select elements in input groups. To fix it, we float the input. Details:
     // https://github.com/twbs/bootstrap/issues/11561#issuecomment-28936855