diff options
| author | fat <jacobthornton@gmail.com> | 2013-07-18 12:08:19 +0400 |
|---|---|---|
| committer | fat <jacobthornton@gmail.com> | 2013-07-18 12:08:19 +0400 |
| commit | 6ec8a1e44f6b58ed57d015916a4fe39bfb0e2340 (patch) | |
| tree | 8480da0e7c249bf59f6a13e9f108d1429e1d4741 /docs/javascript.html | |
| parent | 4b40ee692dc066f2ad3c4dd96af67a83475f5cbe (diff) | |
| parent | 181b27677492050adceaa52fe972115515759f07 (diff) | |
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
Conflicts:
docs/assets/js/bootstrap.min.js
Diffstat (limited to 'docs/javascript.html')
| -rw-r--r-- | docs/javascript.html | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/docs/javascript.html b/docs/javascript.html index fd239b4065..94946a3512 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 --> |