From dd9c15273c4aceeada22754ee9a0af2aae7eb8ea Mon Sep 17 00:00:00 2001
From: Kevin Suttle <kevin@kevinsuttle.com>
Date: Sat, 24 Aug 2013 11:32:23 -0400
Subject: Add even more  role="button" attributes

Missed the <a class="btw" in my regex search
---
 examples/carousel/index.html | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'examples/carousel')

diff --git a/examples/carousel/index.html b/examples/carousel/index.html
index d962c1e6f..5ba413288 100644
--- a/examples/carousel/index.html
+++ b/examples/carousel/index.html
@@ -79,7 +79,7 @@
             <div class="carousel-caption">
               <h1>Example headline.</h1>
               <p>Cras justo odio, dapibus ac facilisis in, egestas eget quam. Donec id elit non mi porta gravida at eget metus. Nullam id dolor id nibh ultricies vehicula ut id elit.</p>
-              <p><a class="btn btn-large btn-primary" href="#">Sign up today</a></p>
+              <p><a class="btn btn-large btn-primary" href="#" role="button">Sign up today</a></p>
             </div>
           </div>
         </div>
@@ -89,7 +89,7 @@
             <div class="carousel-caption">
               <h1>Another example headline.</h1>
               <p>Cras justo odio, dapibus ac facilisis in, egestas eget quam. Donec id elit non mi porta gravida at eget metus. Nullam id dolor id nibh ultricies vehicula ut id elit.</p>
-              <p><a class="btn btn-large btn-primary" href="#">Learn more</a></p>
+              <p><a class="btn btn-large btn-primary" href="#" role="button">Learn more</a></p>
             </div>
           </div>
         </div>
@@ -99,7 +99,7 @@
             <div class="carousel-caption">
               <h1>One more for good measure.</h1>
               <p>Cras justo odio, dapibus ac facilisis in, egestas eget quam. Donec id elit non mi porta gravida at eget metus. Nullam id dolor id nibh ultricies vehicula ut id elit.</p>
-              <p><a class="btn btn-large btn-primary" href="#">Browse gallery</a></p>
+              <p><a class="btn btn-large btn-primary" href="#" role="button">Browse gallery</a></p>
             </div>
           </div>
         </div>
@@ -122,19 +122,19 @@
           <img class="img-circle" src="data:image/png;base64," data-src="holder.js/140x140" alt="Generic placeholder image">
           <h2>Heading</h2>
           <p>Donec sed odio dui. Etiam porta sem malesuada magna mollis euismod. Nullam id dolor id nibh ultricies vehicula ut id elit. Morbi leo risus, porta ac consectetur ac, vestibulum at eros. Praesent commodo cursus magna.</p>
-          <p><a class="btn btn-default" href="#">View details &raquo;</a></p>
+          <p><a class="btn btn-default" href="#" role="button">View details &raquo;</a></p>
         </div><!-- /.col-lg-4 -->
         <div class="col-lg-4">
           <img class="img-circle" src="data:image/png;base64," data-src="holder.js/140x140" alt="Generic placeholder image">
           <h2>Heading</h2>
           <p>Duis mollis, est non commodo luctus, nisi erat porttitor ligula, eget lacinia odio sem nec elit. Cras mattis consectetur purus sit amet fermentum. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh.</p>
-          <p><a class="btn btn-default" href="#">View details &raquo;</a></p>
+          <p><a class="btn btn-default" href="#" role="button">View details &raquo;</a></p>
         </div><!-- /.col-lg-4 -->
         <div class="col-lg-4">
           <img class="img-circle" src="data:image/png;base64," data-src="holder.js/140x140" alt="Generic placeholder image">
           <h2>Heading</h2>
           <p>Donec sed odio dui. Cras justo odio, dapibus ac facilisis in, egestas eget quam. Vestibulum id ligula porta felis euismod semper. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus.</p>
-          <p><a class="btn btn-default" href="#">View details &raquo;</a></p>
+          <p><a class="btn btn-default" href="#" role="button">View details &raquo;</a></p>
         </div><!-- /.col-lg-4 -->
       </div><!-- /.row -->
 
-- 
cgit v1.2.3


From c84374f9def122c31860260ddeb3049a27da6c2c Mon Sep 17 00:00:00 2001
From: Mark Otto <otto@github.com>
Date: Tue, 27 Aug 2013 08:53:48 -0700
Subject: fixes #9901

---
 examples/carousel/carousel.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'examples/carousel')

diff --git a/examples/carousel/carousel.css b/examples/carousel/carousel.css
index 164f306ea..13d86511c 100644
--- a/examples/carousel/carousel.css
+++ b/examples/carousel/carousel.css
@@ -15,7 +15,7 @@ body {
 /* Special class on .container surrounding .navbar, used for positioning it into place. */
 .navbar-wrapper {
   position: relative;
-  z-index: 15;
+  z-index: 20;
 }
 
 
-- 
cgit v1.2.3


From 4f28fdd22787c2ff96d69d037760db0b7b40648d Mon Sep 17 00:00:00 2001
From: Mark Otto <otto@github.com>
Date: Tue, 27 Aug 2013 09:10:06 -0700
Subject: Fixes #9928 and #9932: carousel example in IE10

* Use absolute positioning instead to remove navbar from flow of
document
* No more negative margin fu
* Flip around padding between container and navbar for proper display
in xs and sm viewports
---
 examples/carousel/carousel.css | 28 ++++++++++++++++++++++++----
 1 file changed, 24 insertions(+), 4 deletions(-)

(limited to 'examples/carousel')

diff --git a/examples/carousel/carousel.css b/examples/carousel/carousel.css
index 13d86511c..a728bd899 100644
--- a/examples/carousel/carousel.css
+++ b/examples/carousel/carousel.css
@@ -14,20 +14,31 @@ body {
 
 /* Special class on .container surrounding .navbar, used for positioning it into place. */
 .navbar-wrapper {
-  position: relative;
+  position: absolute;
+  top: 0;
+  left: 0;
+  right: 0;
   z-index: 20;
 }
 
+/* Flip around the padding for proper display in narrow viewports */
+.navbar-wrapper .container {
+  padding-left: 0;
+  padding-right: 0;
+}
+.navbar-wrapper .navbar {
+  padding-left: 15px;
+  padding-right: 15px;
+}
+
 
 /* CUSTOMIZE THE CAROUSEL
 -------------------------------------------------- */
 
 /* Carousel base class */
 .carousel {
+  height: 500px;
   margin-bottom: 60px;
-
-  /* Negative margin to pull up carousel. 90px is roughly margins and height of navbar. */
-  margin-top: -90px;
 }
 /* Since positioning the image, we need to help out the caption */
 .carousel-caption {
@@ -103,6 +114,15 @@ body {
   .navbar-wrapper {
     margin-top: 20px;
   }
+  .navbar-wrapper .container {
+    padding-left:  15px;
+    padding-right: 15px;
+  }
+  .navbar-wrapper .navbar {
+    padding-left:  0;
+    padding-right: 0;
+  }
+
   /* The navbar becomes detached from the top, so we round the corners */
   .navbar-wrapper .navbar {
     border-radius: 4px;
-- 
cgit v1.2.3