From a62e97091c6c1bd732a8f7e0761e724dfe50e0df Mon Sep 17 00:00:00 2001
From: Seth Lilly <seth@sethlilly.com>
Date: Thu, 2 May 2013 14:03:54 -0300
Subject: Corrected typo in carousel.html

Changed text from "First featurette headling" to "First featurette heading" in the first `h2.featurette-heading` tag.
---
 docs/examples/carousel.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'docs')

diff --git a/docs/examples/carousel.html b/docs/examples/carousel.html
index 954375d4b..cd6855aab 100644
--- a/docs/examples/carousel.html
+++ b/docs/examples/carousel.html
@@ -350,7 +350,7 @@ body {
 
   <div class="featurette">
     <img class="featurette-image img-circle pull-right" data-src="holder.js/512x512">
-    <h2 class="featurette-heading">First featurette headling. <span class="text-muted">It'll blow your mind.</span></h2>
+    <h2 class="featurette-heading">First featurette heading. <span class="text-muted">It'll blow your mind.</span></h2>
     <p class="lead">Donec ullamcorper nulla non metus auctor fringilla. Vestibulum id ligula porta felis euismod semper. Praesent commodo cursus magna, vel scelerisque nisl consectetur. Fusce dapibus, tellus ac cursus commodo.</p>
   </div>
 
-- 
cgit v1.2.3


From 08fea3304ac8393ca5f549082f7e195e1762fb40 Mon Sep 17 00:00:00 2001
From: Kevin Ingersoll <kingersoll@gmail.com>
Date: Fri, 3 May 2013 15:27:10 +1200
Subject: Fix input border flicker in Chrome from @garoevans, closes #7689

---
 docs/assets/css/bootstrap.css | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'docs')

diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index 1f338a871..281508ac0 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -1261,10 +1261,10 @@ input[type="color"] {
   border-radius: 4px;
   -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
           box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
-  -webkit-transition: border linear 0.2s, box-shadow linear 0.2s;
-     -moz-transition: border linear 0.2s, box-shadow linear 0.2s;
-       -o-transition: border linear 0.2s, box-shadow linear 0.2s;
-          transition: border linear 0.2s, box-shadow linear 0.2s;
+  -webkit-transition: border-color linear 0.2s, box-shadow linear 0.2s;
+     -moz-transition: border-color linear 0.2s, box-shadow linear 0.2s;
+       -o-transition: border-color linear 0.2s, box-shadow linear 0.2s;
+          transition: border-color linear 0.2s, box-shadow linear 0.2s;
 }
 
 input,
-- 
cgit v1.2.3