Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/twbs/bootstrap.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Otto <otto@github.com>2013-07-18 11:43:48 +0400
committerMark Otto <otto@github.com>2013-07-18 11:43:48 +0400
commit1363ffa473a7f68e540563632aaf8293cf1be5fc (patch)
tree2cec1c2cc4ab9a0fae56c12c2fb05a32485dbb53 /docs/javascript.html
parente7bc9e1c3d60c2ac748896fcc0e31855f63590ef (diff)
parent8a84da6341e19011ce8f8e518d7b1cb7f0931da5 (diff)
Merge branch '3.0.0-wip' of https://github.com/mauricew/bootstrap into mauricew-3.0.0-wip
Diffstat (limited to 'docs/javascript.html')
-rw-r--r--docs/javascript.html16
1 files changed, 10 insertions, 6 deletions
diff --git a/docs/javascript.html b/docs/javascript.html
index af58be40f1..089aa60ec7 100644
--- a/docs/javascript.html
+++ b/docs/javascript.html
@@ -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 -->