From: Mark Otto <otto@github.com>
Date: Wed, 4 Sep 2013 01:43:42 +0000 (-0700)
Subject: Merge branch 'master' into carousel-glyphicons-mainstream
X-Git-Tag: v3.0.1~70
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dcdafa422057863aea3e328e1d86ee25eda7e37b;p=thirdparty%2Fbootstrap.git

Merge branch 'master' into carousel-glyphicons-mainstream

Conflicts:
	javascript.html
---

dcdafa422057863aea3e328e1d86ee25eda7e37b
diff --cc javascript.html
index 3a106ab69f,3013d5ca2d..bc6d132382
--- a/javascript.html
+++ b/javascript.html
@@@ -1711,6 -1711,14 +1711,10 @@@ $('#myCollapsible').on('hidden.bs.colla
    </a>
  </div>
  {% endhighlight %}
+ <div class="bs-callout bs-callout-warning" id="callout-carousel-transitions">
+   <h4>Transition animations not supported in Internet Explorer 8 &amp; 9</h4>
+   <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-info">
 -  <h4>Glyphicon Alternative</h4>
 -  <p>With <a href="{{ page.base_url }}components/#glyphicons">Glyphicons</a> available, you may choose to style the left and right toggle buttons with <code>.glyphicon .glyphicon-chevron-left</code> and <code>.glyphicon .glyphicon-chevron-right</code>.</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>