From f4129792874465a7950b871c6042110f47954248 Mon Sep 17 00:00:00 2001
From: Aaron Cordovez <aaron.cordovez.m@gmail.com>
Date: Sat, 1 Nov 2014 17:46:33 -0700
Subject: Fix typo

Corrected spelling of the word "elements"
---
 docs/_includes/js/carousel.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'docs/_includes/js/carousel.html')

diff --git a/docs/_includes/js/carousel.html b/docs/_includes/js/carousel.html
index 62adc09e6..a74802b62 100644
--- a/docs/_includes/js/carousel.html
+++ b/docs/_includes/js/carousel.html
@@ -1,7 +1,7 @@
 <div class="bs-docs-section">
   <h1 id="carousel" class="page-header">Carousel <small>carousel.js</small></h1>
 
-  <p>A slideshow component for cycling through elemnts, like a carousel. <strong>Nested carousels are not supported.</strong></p>
+  <p>A slideshow component for cycling through elements, like a carousel. <strong>Nested carousels are not supported.</strong></p>
 
   <h2 id="carousel-examples">Examples</h2>
   <div class="bs-example">
-- 
cgit v1.2.3


From 917decab6cc15c0178b1ebf9d30e4e3c0ef90c7f Mon Sep 17 00:00:00 2001
From: Jayanth Koushik <jnkoushik@gmail.com>
Date: Tue, 11 Nov 2014 15:28:21 +0530
Subject: Fix Issue #15076.

This commit adds documentation explaining the need to have an initial
.active element in carousels.
---
 docs/_includes/js/carousel.html | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'docs/_includes/js/carousel.html')

diff --git a/docs/_includes/js/carousel.html b/docs/_includes/js/carousel.html
index a74802b62..56dd856d9 100644
--- a/docs/_includes/js/carousel.html
+++ b/docs/_includes/js/carousel.html
@@ -75,6 +75,11 @@
     <p>Bootstrap exclusively uses CSS3 for its animations, but Internet Explorer 8 &amp; 9 don't support the necessary CSS properties. Thus, there are no slide transition animations when using these browsers. We have intentionally decided not to include jQuery-based fallbacks for the transitions.</p>
   </div>
 
+  <div class="bs-callout bs-callout-warning" id="callout-carousel-active">
+    <h4>Initial active element required</h4>
+    <p>The <code>.active</code> class needs to be added to one of the slides. Otherwise, the carousel will not be visible.</p>
+  </div>
+
   <h3>Optional captions</h3>
   <p>Add captions to your slides easily with the <code>.carousel-caption</code> element within any <code>.item</code>. Place just about any optional HTML within there and it will be automatically aligned and formatted.</p>
   <div class="bs-example">
-- 
cgit v1.2.3


From 9391ef207ff05f28e3952afdb92639c02b5920f5 Mon Sep 17 00:00:00 2001
From: "Patrick H. Lauke" <redux@splintered.co.uk>
Date: Tue, 11 Nov 2014 22:41:21 +0000
Subject: aria-hidden added to some stray glyphicons

plus minor tweak to customizer's generated alerts
---
 docs/_includes/js/carousel.html | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'docs/_includes/js/carousel.html')

diff --git a/docs/_includes/js/carousel.html b/docs/_includes/js/carousel.html
index a74802b62..9c13aa033 100644
--- a/docs/_includes/js/carousel.html
+++ b/docs/_includes/js/carousel.html
@@ -23,11 +23,11 @@
         </div>
       </div>
       <a class="left carousel-control" href="#carousel-example-generic" role="button" data-slide="prev">
-        <span class="glyphicon glyphicon-chevron-left"></span>
+        <span class="glyphicon glyphicon-chevron-left" aria-hidden="true"></span>
         <span class="sr-only">Previous</span>
       </a>
       <a class="right carousel-control" href="#carousel-example-generic" role="button" data-slide="next">
-        <span class="glyphicon glyphicon-chevron-right"></span>
+        <span class="glyphicon glyphicon-chevron-right" aria-hidden="true"></span>
         <span class="sr-only">Next</span>
       </a>
     </div>
@@ -60,11 +60,11 @@
 
   <!-- Controls -->
   <a class="left carousel-control" href="#carousel-example-generic" role="button" data-slide="prev">
-    <span class="glyphicon glyphicon-chevron-left"></span>
+    <span class="glyphicon glyphicon-chevron-left" aria-hidden="true"></span>
     <span class="sr-only">Previous</span>
   </a>
   <a class="right carousel-control" href="#carousel-example-generic" role="button" data-slide="next">
-    <span class="glyphicon glyphicon-chevron-right"></span>
+    <span class="glyphicon glyphicon-chevron-right" aria-hidden="true"></span>
     <span class="sr-only">Next</span>
   </a>
 </div>
@@ -108,11 +108,11 @@
         </div>
       </div>
       <a class="left carousel-control" href="#carousel-example-captions" role="button" data-slide="prev">
-        <span class="glyphicon glyphicon-chevron-left"></span>
+        <span class="glyphicon glyphicon-chevron-left" aria-hidden="true"></span>
         <span class="sr-only">Previous</span>
       </a>
       <a class="right carousel-control" href="#carousel-example-captions" role="button" data-slide="next">
-        <span class="glyphicon glyphicon-chevron-right"></span>
+        <span class="glyphicon glyphicon-chevron-right" aria-hidden="true"></span>
         <span class="sr-only">Next</span>
       </a>
     </div>
-- 
cgit v1.2.3