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

Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip

Browse Source 
Conflicts:
	docs/assets/js/bootstrap.min.js
This commit is contained in:
fat
2013-07-18 01:08:19 -07:00
parent 4b40ee692d 181b276774
commit 6ec8a1e44f
14 changed files with 181 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
docs/javascript.html
View File

@@ -1518,10 +1518,10 @@ $('#myCollapsible').on('hidden.bs.collapse', function () {
</div>
</div>
<a class="left carousel-control" href="#carousel-example-generic" data-slide="prev">
<span class="glyphicon glyphicon-chevron-left"></span>
<span class="icon-prev"></span>
</a>
<a class="right carousel-control" href="#carousel-example-generic" data-slide="next">
<span class="glyphicon glyphicon-chevron-right"></span>
<span class="icon-next"></span>
</a>
</div>
</div><!-- /example -->
@@ -1547,13 +1547,17 @@ $('#myCollapsible').on('hidden.bs.collapse', function () {
<!-- Controls -->
<a class="left carousel-control" href="#carousel-example-generic" data-slide="prev">
<span class="glyphicon glyphicon-chevron-left"></span>
<span class="icon-prev"></span>
</a>
<a class="right carousel-control" href="#carousel-example-generic" data-slide="next">
<span class="glyphicon glyphicon-chevron-right"></span>
<span class="icon-next"></span>
</a>
</div>
{% endhighlight %}
<div class="bs-callout">
<h4>Glyphicon Alternative</h4>
<p>With <a href="/css/#glyphicons">Glyphicons</a> available, you may choose to style the left and right toggle buttons with <code>.glyphicon-chevron-left</code> and <code>.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>
@@ -1592,10 +1596,10 @@ $('#myCollapsible').on('hidden.bs.collapse', function () {
</div>
</div>
<a class="left carousel-control" href="#carousel-example-captions" data-slide="prev">
<span class="glyphicon glyphicon-chevron-left"></span>
<span class="icon-prev"></span>
</a>
<a class="right carousel-control" href="#carousel-example-captions" data-slide="next">
<span class="glyphicon glyphicon-chevron-right"></span>
<span class="icon-next"></span>
</a>
</div>
</div><!-- /example -->