mirror_css/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-09-25 12:59:05 +02:00
Code Issues Releases Wiki Activity

Merge branch 'master' into carousel-glyphicons-mainstream

Browse Source 
Conflicts:
	javascript.html
This commit is contained in:
Mark Otto
2013-09-03 18:43:42 -07:00
parent 73e4b81790 72b1f69bfc
commit dcdafa4220
3 changed files with 17 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
javascript.html
View File

@@ -1711,6 +1711,10 @@ $('#myCollapsible').on('hidden.bs.collapse', function () {
</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>
<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>