From c834b4027c88f3d3fe28597f136968c9fdac848f Mon Sep 17 00:00:00 2001
From: Ross Allen <reallen@gmail.com>
Date: Sat, 27 Jul 2013 20:14:49 -0700
Subject: [PATCH 1/2] Match .carousel-inner specificity to beat styles

'.carousel ing' was replaced with '.carousel-inner > .item > img' in
3.0 and now loses the specificity war. To make carousel images 500px
tall, match specificity to make carousel.css win.
---
 carousel/carousel.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/carousel/carousel.css b/carousel/carousel.css
index 49f8483a26..24b96f9c31 100644
--- a/carousel/carousel.css
+++ b/carousel/carousel.css
@@ -40,7 +40,7 @@ body {
 .carousel .item {
   height: 500px;
 }
-.carousel img {
+.carousel-inner > .item > img {
   position: absolute;
   top: 0;
   left: 0;

From ce1fdc5ded80c3bfd0f0e7b1cce124f4e86ade6a Mon Sep 17 00:00:00 2001
From: Ross Allen <reallen@gmail.com>
Date: Sat, 27 Jul 2013 20:17:53 -0700
Subject: [PATCH 2/2] Update carousel example JS path

'bootstrap.min.js' lives in '../bootstrap/js' now. Switch to the
minified version for a smaller download since this example is focused
on CSS changes, not JavaScript ones.
---
 carousel/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/carousel/index.html b/carousel/index.html
index 9111e3bf16..042473ad83 100644
--- a/carousel/index.html
+++ b/carousel/index.html
@@ -175,7 +175,7 @@
     ================================================== -->
     <!-- Placed at the end of the document so the pages load faster -->
     <script src="../assets/js/jquery.js"></script>
-    <script src="../dist/js/bootstrap.js"></script>
+    <script src="../bootstrap/js/bootstrap.min.js"></script>
     <script src="../assets/js/holder.js"></script>
   </body>
 </html>